Merge from trunk

diff --cc configure.ac
index ef67be05215d8c307955114211c4a89791d918ba,629021e5efeb1f0ad864d1f44d124d430d51609a..0d6098220460cbb57d90622b6e42e5b05d140a18
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -3848,9 -3832,60 +3832,61 @@@ AC_CONFIG_FILES(
        helpers/ssl/Makefile
        helpers/storeid_rewrite/Makefile
        helpers/storeid_rewrite/file/Makefile
+       helpers/url_rewrite/Makefile
+       helpers/url_rewrite/fake/Makefile
+       helpers/url_rewrite/LFS/Makefile
+       icons/Makefile
+       lib/Makefile
+       lib/libTrie/Makefile
+       lib/libTrie/test/Makefile
+       lib/ntlmauth/Makefile
+       lib/profiler/Makefile
+       lib/rfcnb/Makefile
+       lib/smblib/Makefile
+       lib/snmplib/Makefile
+       scripts/Makefile
+       src/Makefile
+       src/acl/Makefile
+       src/adaptation/Makefile
+       src/adaptation/icap/Makefile
+       src/adaptation/ecap/Makefile
+       src/anyp/Makefile
+       src/auth/Makefile
+       src/auth/basic/Makefile
+       src/auth/digest/Makefile
+       src/auth/negotiate/Makefile
+       src/auth/ntlm/Makefile
+       src/base/Makefile
+       src/clients/Makefile
+       src/comm/Makefile
+       src/esi/Makefile
+       src/eui/Makefile
+       src/format/Makefile
+       src/fs/Makefile
+       src/ftp/Makefile
+       src/helper/Makefile
+       src/http/Makefile
+       src/http/one/Makefile
+       src/icmp/Makefile
+       src/ident/Makefile
+       src/ip/Makefile
+       src/ipc/Makefile
+       src/log/Makefile
+       src/mem/Makefile
+       src/mgr/Makefile
+       src/parser/Makefile
+       src/repl/Makefile
++      src/security/Makefile
+       src/servers/Makefile
+       src/snmp/Makefile
+       src/ssl/Makefile
+       test-suite/Makefile
        tools/Makefile
-       tools/squidclient/Makefile
+       tools/helper-mux/Makefile
        tools/purge/Makefile
+       tools/squidclient/Makefile
+       tools/systemd/Makefile
+       tools/sysvinit/Makefile
  ])
  
  # must configure libltdl subdir unconditionally for "make distcheck" to work

diff --cc doc/release-notes/release-3.6.sgml
index 052b6c50f3e4b34a4dd9abcb7d0f126b25fc7cb2,3d6156753097aea85d42597b088a2baa80e7ea46..0efeced036e67fd5d39887f272762a156a91a5a0
--- 1/doc/release-notes/release-3.6.sgml
--- 2/doc/release-notes/release-3.6.sgml
+++ b/doc/release-notes/release-3.6.sgml
@@@ -64,10 -98,10 +98,14 @@@ This section gives a thorough account o
  <sect1>New tags<label id="newtags">
  <p>
  <descrip>
 +      <tag>tls_outgoing_options</tag>
 +      <p>New tag to define TLS security context options for outgoing
 +         connections. For example to HTTPS servers.
 +
+          <tag> url_rewrite_timeout </tag>
+          <p> Squid times active requests to redirector. This option sets
+              the timeout value and the Squid reaction to a timed out
+              request. </p>
  </descrip>
  
  <sect1>Changes to existing tags<label id="modifiedtags">

diff --cc src/CachePeer.h
Simple merge

diff --cc src/FwdState.cc
Simple merge

diff --cc src/Makefile.am
index c83c20efb80f930379318f47b0da37e9bb9e87a7,6619f467780c85597e4795e8141d59102feb5272..bd7686508c91243d33c8dac8fc9323525af3ffd8
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -614,6 -608,12 +607,13 @@@ squid_LDADD = 
        $(AUTH_LIBS) \
        $(DISK_LIBS) \
        acl/libapi.la \
+       clients/libclients.la \
+       servers/libservers.la \
+       ftp/libftp.la \
+       helper/libhelper.la \
+       http/libsquid-http.la \
+       parser/libsquid-parser.la \
++      security/libsecurity.la \
        base/libbase.la \
        libsquid.la \
        ip/libip.la \

diff --cc src/PeerPoolMgr.cc
Simple merge

diff --cc src/SquidConfig.h
Simple merge

diff --cc src/cache_cf.cc
Simple merge

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

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

diff --cc src/cf_gen_defines
Simple merge

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

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

diff --cc src/tunnel.cc
Simple merge