Commit 96107974710aea800b7f0bd6cc14c13fec077c08

Nick Mathewson 2011-05-03T14:29:44

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