Commit 6c2ef970c31de29d2283be69cb972d7c5fdc092b

Nick Mathewson 2011-04-27T20:07:13

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