Commit c5b6e46488e2ee04909aae0b1d230130c323079c

Nick Mathewson 2012-02-10T22:18:19

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