Merge from trunk

diff --cc src/Makefile.am
index 322941399a6fc3402a741f644b9dc802466a8f3e,a3d0b38912c7cb9d68057a5efe29c0e3d9a22aac..1f6db6d1c83982bef8c9d2698e5948fd7b3e801f
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -2151,8 -2130,6 +2129,7 @@@ tests_testEventLoop_SOURCES = 
        int.cc \
        internal.h \
        internal.cc \
-       tests/stub_libsecurity.cc \
 +      LogTags.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \
@@@ -2392,8 -2370,6 +2370,7 @@@ tests_test_http_range_SOURCES = 
        internal.cc \
        $(IPC_SOURCE) \
        ipcache.cc \
-       tests/stub_libsecurity.cc \
 +      LogTags.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \
@@@ -3505,8 -3485,6 +3487,7 @@@ tests_testURL_SOURCES = 
        int.cc \
        internal.h \
        internal.cc \
-       tests/stub_libsecurity.cc \
 +      LogTags.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \

diff --cc src/client_side.cc
Simple merge

diff --cc src/format/Format.cc
Simple merge

diff --cc src/htcp.cc
Simple merge