Commit 2c6b3246fd9e3a3fa4f1a4b0126f0fc1e07d628c

Nick Mathewson 2012-01-24T17:18:52

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