From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 15 Feb 2016 15:53:15 +0000 (+1300)
Subject: 4.0.6
X-Git-Tag: SQUID_4_0_6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=404063c59bb4ffa6c5a005611c4375f82ddd423f;p=thirdparty%2Fsquid.git

4.0.6
---

diff --git a/ChangeLog b/ChangeLog
index 20a7c63bbc..34537f2911 100644
--- 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 4ea06330e8..d852733ad7 100644
--- 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)