Commit 2a3b5872fe1a2fa0f67d1b435b4650d337c16c4d

Nick Mathewson 2010-10-21T12:23:10

Merge branch 'http_small_tweaks' Conflicts: http-internal.h