Commit 6ae44b5da98dfe0b28972d06f9c0c1c406344c80

Nick Mathewson 2014-12-01T08:32:23

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