Commit cbab7dad728b425ed5cfcb7e0d61ac77ef523d3b

Nick Mathewson 2011-05-20T14:21:55

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