Commit 2bbed8fe2ac99069817dc2d76c7762b474c41089

Nick Mathewson 2011-07-02T21:50:49

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