4.0.6

diff --git a/ChangeLog b/ChangeLog
index 20a7c63bbc2b6f73cf47b3cb7b8b02d044e721d6..34537f291192a3d28b7312a555ecda81d68247d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,6 @@ Changes to squid-4.0.6 (16 Feb 2016):
 
        - Regression Bug 4436: Fix DEFAULT_SSL_CRTD
        - Fix "dial: Ssl::PeerConnector::sslCrtvdHandleReply threw exception: callback != NULL"
-       - Fix %un logging external ACL username
        - ... and some documentation updates
        - ... and all fixes from squid 3.5.14
 
@@ -122,7 +121,9 @@ Changes to squid-3.5.14 (16 Feb 2016):
        - Fix handling of shared memory left over by Squid crashes or bugs
        - Fix mgr:config report 'qos_flows mark' output
        - Fix compile error in CPU affinity
+       - Fix %un logging external ACL username
        - Avoid more certificate validation memory leaks
+       - ... and some documentation updates
 
 Changes to squid-3.5.13 (06 Jan 2016):
 

diff --git a/configure.ac b/configure.ac
index 4ea06330e8306d4f468f32f0da8f860cf0ce4bed..d852733ad70f819f4c78c444b99aea9622f90bcb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-AC_INIT([Squid Web Proxy],[4.0.5-BZR],[http://bugs.squid-cache.org/],[squid])
+AC_INIT([Squid Web Proxy],[4.0.6-BZR],[http://bugs.squid-cache.org/],[squid])
 AC_PREREQ(2.61)
 AC_CONFIG_HEADERS([include/autoconf.h])
 AC_CONFIG_AUX_DIR(cfgaux)