Commit 0cb70e3333bc174b9490eeaa9ddac7e475476072

Nick Mathewson 2011-10-26T10:17:21

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