Commit a093137809252f24ee70f3258a5e2a81cd3551e8

Nick Mathewson 2013-09-19T10:48:27

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