Commit ac461206c4f6015ca8906a228eb5a10175de481b

Nick Mathewson 2011-07-18T18:23:13

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