Commit 97094614578b3f4e5c462ce9e3afee2a9705698c

Nick Mathewson 2013-02-14T14:13:11

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