Commit 9f5bf6639625f66055c1858551dd6d2208809ce6

Nick Mathewson 2011-02-08T22:24:51

Merge remote branch 'origin/patches-2.0'