Commit 32ed11024a7209ecf33ee1387fdf0b112c3278b0

Nick Mathewson 2012-10-26T19:37:00

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