Commit 9d6acdc551ea90afc79f0e2dbb81a350cc7944ee

Nick Mathewson 2014-08-29T15:00:33

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