Merge from trunk rev.14687

diff --cc src/client_side.cc
Simple merge

diff --cc src/security/Makefile.am
Simple merge

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

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