Commit 257651a48c050ca276e4de1aad656d74f7deb348

Nick Mathewson 2011-05-27T23:33:40

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