Commit 356554c8dc549280bc9695d189805ca9134034ad

Nick Mathewson 2011-10-25T11:43:01

Merge remote-tracking branch 'origin/patches-2.0'