Commit 748a0d27948c8c7efd8c3b809a5d020ca1a9da35

Nick Mathewson 2011-12-06T13:38:40

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