Commit 86f02d75335ab0b6238865fcbabc414273efbb7c

Nick Mathewson 2011-02-01T02:12:46

Merge remote branch 'origin/patches-2.0'