Commit 3596a31d6376f2ac0740d37f9fdc27f0b4a2f76d

Nick Mathewson 2011-11-18T15:35:33

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