am 3c636203: Merge "Fix a bug in tunnel construction and \'Connection: close\' headers."

* commit '3c636203845b858c6fa7c7db83f922b0f008f35a':
  Fix a bug in tunnel construction and 'Connection: close' headers.