Commit 86665a582dc2e779130a119407504192663c9c26

Nick Mathewson 2014-03-21T14:09:54

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