Commit 38674d4a5e6f5793febae4a065860ac0a15e4842

Nick Mathewson 2011-09-12T15:46:54

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