Commit 78fb99ceb265d5969e06f55b9b9f78d1593ebb7b

Nick Mathewson 2011-07-04T12:22:54

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