Commit 5dc200b7c840188288facc7e9803f51d6396697f

Nick Mathewson 2011-02-22T18:53:55

Merge branch '20_uri_nonconformant' into patches-2.0