Commit 5cc7806cc4f441538cfc88f1b8d8aff784b400fe

Nick Mathewson 2012-12-04T12:32:26

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