Commit bf11e7ddf7a3f8d6e6bd13aec944dcd37f1763ff

Nick Mathewson 2010-10-21T15:33:13

Merge branch 'http_uri_parse'