Commit 10996a1a0b67afad5da575040b841806e472c3c6

Nick Mathewson 2012-01-24T11:04:56

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