Commit 1ebe795544ff0a34a1d4e180baf65ea9e9261010

Nick Mathewson 2011-09-26T11:11:30

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