Prep for 4.0.6 and 3.5.14

diff --git a/ChangeLog b/ChangeLog
index bfa6d4538bb4cd8c58c3f631548a70811f8eb3b2..20a7c63bbc2b6f73cf47b3cb7b8b02d044e721d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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
+
 Changes to squid-4.0.5 (09 Feb 2016):
 
        - Regression Bug 4429: http(s)_port options= error message missing characters
@@ -103,6 +111,19 @@ Changes to squid-4.0.1 (14 Oct 2015):
        - ... and many documentation changes
        - ... and much code cleanup and polishing
 
+Changes to squid-3.5.14 (16 Feb 2016):
+
+       - Bug 4437: Fix Segfault on Certain SSL Handshake Errors
+       - Bug 4431: C code is not compiled with CFLAGS
+       - Bug 4418: FlexibleArray compile error with GCC 6
+       - Bug 4378: assertion failed: DestinationIp.cc:60:
+               'checklist->conn() && checklist->conn()->clientConnection != NULL'
+       - Fix invalid FTP connection handling on blocked content
+       - 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
+       - Avoid more certificate validation memory leaks
+
 Changes to squid-3.5.13 (06 Jan 2016):
 
        - Bug 4397: DragonFly BSD, POSIX shared memory is implemented as filepath

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

diff --git a/doc/release-notes/release-4.sgml b/doc/release-notes/release-4.sgml
index f16c47319fb38b71c17d09136de0fe2a48e0afbd..0ffc7247e90a2d1329ad86585579c6cf05be1a0f 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.5 release notes</title>
+<title>Squid 4.0.6 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.5 for testing.
+<p>The Squid Team are pleased to announce the release of Squid-4.0.6 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">.