Fixups for 9.2

See commit log for details on changes.
Nit: it's really the HTTP implementation which tells the TLS 1.2 implementation to do something, here and below.