Commit f1e9a7e7e442f80b61a2dd6f0c8f1f5ce456b033

Nick Mathewson 2011-01-06T12:44:45

Merge remote branch 'origin/patches-2.0'