4.0.4

diff --git a/ChangeLog b/ChangeLog
index d8cc7bc9ecb5a08f3d74ea6745ee115a8059e227..928fef5aa59aaf74a8e460bc3dcd9ee4d56426d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Changes to squid-4.0.4 (06 Jan 2016):
 
+       - Regression Bug 4393: compile fails on OS X
+       - Bug 4392: assertion CbcPointer.h:159: 'c' via tunnelServerClosed or tunnelClientClosed
        - Support use of Kerberos credentials cache instead of keytab
        - Support logging of TLS Cryptography Parameters
        - Support substring matching in Note ACL

diff --git a/configure.ac b/configure.ac
index 671ad9c3decfcd313dee04e1b60abb86a3796460..ca6fcabb0e17856e2b19553b9e657b80ddfa3c34 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.3-BZR],[http://bugs.squid-cache.org/],[squid])
+AC_INIT([Squid Web Proxy],[4.0.4-BZR],[http://bugs.squid-cache.org/],[squid])
 AC_PREREQ(2.61)
 AC_CONFIG_HEADERS([include/autoconf.h])
 AC_CONFIG_AUX_DIR(cfgaux)

diff --git a/doc/release-notes/release-4.sgml b/doc/release-notes/release-4.sgml
index 72393afa53fc4a2257c6bcafd6148a2fe22ded57..c007bf7e698c3a772671c16d9465a060861bfb5a 100644 (file)
--- a/doc/release-notes/release-4.sgml
+++ b/doc/release-notes/release-4.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 4.0.3 release notes</title>
+<title>Squid 4.0.4 release notes</title>
 <author>Squid Developers</author>
 
 <abstract>
@@ -12,7 +12,7 @@ for Applied Network Research and members of the Web Caching community.
 <toc>
 
 <sect>Notice
-<p>The Squid Team are pleased to announce the release of Squid-4.0.3 for testing.
+<p>The Squid Team are pleased to announce the release of Squid-4.0.4 for testing.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v4/"> or the
  <url url="http://www.squid-cache.org/Download/http-mirrors.html" name="mirrors">.