Commit 78762383b74ad8159d8c6176fb73c9fdb9ce9623

Nick Mathewson 2010-11-03T15:18:34

Merge branch 'http_nolegacy_v2'