Commit 3f659e5aeb61d856f8d47624e7109eb06c141739

Nick Mathewson 2012-04-19T11:14:58

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