Merged from trunk (r12098, v3.2.0.16+).

diff --cc src/Makefile.am
Simple merge

diff --cc src/cf.data.pre
Simple merge

diff --cc src/ssl/Makefile.am
index 519c75f6be4f5210e5bfd6f691b1c4cb7a36271d,f49a7a33707ab76292d55ac8948f71e395e6f142..d4a96cc40ae7ce3cb07d9f15fdbc3e937d42b01f
--- 1/src/ssl/Makefile.am
--- 2/src/ssl/Makefile.am
+++ b/src/ssl/Makefile.am
@@@ -30,11 -31,12 +31,14 @@@ libsslsquid_la_SOURCES = 
        ErrorDetail.h \
        ErrorDetailManager.cc \
        ErrorDetailManager.h \
 +      ServerBump.cc \
 +      ServerBump.h \
        support.cc \
-       support.h
+       support.h \
+       \
+       $(SSL_CRTD_SOURCE)
  
+ ## SSL stuff used by main Squid and ssl_crtd
  libsslutil_la_SOURCES = \
        gadgets.cc \
        gadgets.h \