Commit 00145918657d0a4b750d5ea234fd484e936f371b

Nick Mathewson 2011-10-30T22:34:00

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