Commit 571295bdf89bc9d73e1b0720140d9615fa0a304c

Nick Mathewson 2014-08-18T10:14:29

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