Commit 5cf0db7d83f700f5fd5656bc844438a370999a24

Nick Mathewson 2012-08-23T14:41:51

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