While I agree there's some ambiguity between HTTPConnection and a Socket conncetion, I rather not rename `conn` to `sock`, since we still call it `conn` everywhere else (e.g. `_new_conn`).

If we really want to rename it, let's leave it to a separate more thorough API-breaking PR.