Commit 0dca19bb8e272f92c058edc4b8af5ee29ad33502

Nick Mathewson 2011-05-30T12:09:18

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