Commit 3ec46c0c3451ba05b4c3391797d00ff33cd19ac9

Nick Mathewson 2011-05-23T01:44:05

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