Commit a12839b0838cb6b24f6993b17b2a284a3944d1c5

Nick Mathewson 2010-11-29T14:25:33

Merge remote branch 'chrisd/http_fixes2'