Commit 8f5cca47dd6a74e13e358a911ff580d0ba94fb46

Nick Mathewson 2011-02-21T23:27:23

Merge remote branch 'origin/patches-2.0'