Commit fc1a2514a117692ac62ce49f1a5833993fe67657

Nick Mathewson 2011-10-19T22:20:15

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