Merged from trunk rev.14181

diff --cc src/AccessLogEntry.h
Simple merge

diff --cc src/Makefile.am
index 90bc10e2add9c3231acc69e5f4e2c86ce96f447a,c1c9668cdadd418f728ed2632b88a91de6093400..659ffe0183a9389533c314b122cf8ba66c7bcdb4
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -3524,8 -3338,7 +3338,8 @@@ tests_testURL_SOURCES = 
        int.cc \
        internal.h \
        internal.cc \
-       tests/stub_libsecurity.cc \
 +      tests/stub_libeui.cc \
+       LogTags.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \

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

diff --cc src/external_acl.cc
Simple merge

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