Commit c00416f745955684a9034866c53357e93329b3b3

Nick Mathewson 2012-02-06T12:39:09

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