Merged from v5 r14984

diff --cc src/client_side.cc
Simple merge

diff --cc src/ssl/support.cc
Simple merge

diff --cc src/ssl/support.h
Simple merge

diff --cc src/tests/stub_libsslsquid.cc
Simple merge