Commit e2e3c3223937aaa0fadbe52c95b06ccbe4c421a6

Nick Mathewson 2011-02-22T18:55:05

Merge remote branch 'origin/patches-2.0'