Commit 4b7baec668732e215f5f3533f2f74ccfad09a8af

Nick Mathewson 2012-01-26T16:56:33

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