am 3bcb2bf1: Merge "Add support for the TLS Channel ID extension."

* commit '3bcb2bf170d9f351f52159b514cb588a3ce1c53a':
  Add support for the TLS Channel ID extension.