Commit 35f107de922ef64b2b1809af9b6ebe5db1abbb33

Nick Mathewson 2014-09-18T11:36:08

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