Commit 9be8624b2f5633bfa0dc30ae4b6d22312373ef3f

Nick Mathewson 2012-07-30T17:08:44

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