Commit bfdda26534ea66b847760720260a4b4d8fcefe58

Nick Mathewson 2011-04-05T17:22:36

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