Commit d7c0ffa1c06cf8aa2b1caf99332f2669d30fcc74

Nick Mathewson 2011-04-05T17:19:00

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