Commit a9fe47f076f4b521533c5ae31bcd49c2d4cc6f29

Nick Mathewson 2011-05-23T17:50:45

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