Commit 8fd7a243e84579447bf62fd54bea288f7142b1cf

Nick Mathewson 2012-02-10T22:16:46

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