Commit 9ee9e943a8732bee9dc565b1b7cad553f4c06b3f

Nick Mathewson 2011-11-18T14:23:13

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