Commit c882a959568155a44b2d1709555f8fb4b638495c

Nick Mathewson 2011-11-02T23:14:24

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