Commit 909c40e5d1888a3b6898a3777080a8c06dc20e53

Nick Mathewson 2011-08-03T12:12:47

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