Commit fc9bc6566932fb54e26d680fbca467a7f5c01602

Nick Mathewson 2011-04-27T20:26:38

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