Commit ac6904241be9bf56e1de7d6e1f780134359dbd2e

Nick Mathewson 2011-01-02T00:59:20

Merge remote branch 'origin/patches-2.0'