Commit 264c7b96006b46a38d5389cd168590a2394a7f85

Nick Mathewson 2011-06-06T15:26:37

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