Prep for 3.4.11 and 3.5.1

diff --git a/ChangeLog b/ChangeLog
index 9240152cf03fb163364a983365e0d1bf9cfcbad4..d209d5292885866a7bcc01267322e7e9c5569f8e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Changes to squid-3.5.1 (13 Jan 2015):
+
+       - Fix handling of invalid SSL server certificates when splicing connections
+       - basic_smb_lm_auth: Simplified MSNT basic auth helper
+       - squidclient: Fix -A and -P options
+       - ... and several portability fixes
+       - ... and all fixes from squid 3.4.11
+       - ... and a lot of documentation updates
+
 Changes to squid-3.5.0.4 (21 Dec 2014):
 
        - Bug 3826: pt 2: Provide a systemd .service file for Squid
@@ -91,6 +100,17 @@ Changes to squid-3.5.0.1 (17 Oct 2014):
        - ... and many error page translation updates
        - ... and much code cleanup and polishing
 
+Changes to squid-3.4.11 (13 Jan 2015):
+
+       - Bug 4164: SEGFAULT when %W formating code used in errorpages
+       - Bug 4057: Avoid on-exit crashes when adaptation is enabled.
+       - Bug 3760: squidclient ignores --disable-ipv6
+       - Bug 3754: configure doesnt detect IPFilter 5.1.2 system headers
+       - Bug 3664: ssl_crtd fails to build on OpenSolaris/OpenIndiana/Solaris 11
+       - cachemgr.cgi: memory leak in request parser
+       - Deleting first fs left psstate->servers pointing to uninitialized memory
+       - ... and some build issues
+
 Changes to squid-3.4.10 (09 Dec 2014):
 
        - Bug 4148: external_acl_type header format does not accept the new libformat syntax

diff --git a/doc/release-notes/release-3.4.sgml b/doc/release-notes/release-3.4.sgml
index c7f1b7f065bf26eb63446bc561b05b9041dac4c6..503790bcb5698456120821ab28a997115635e194 100644 (file)
--- a/doc/release-notes/release-3.4.sgml
+++ b/doc/release-notes/release-3.4.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 3.4.10 release notes</title>
+<title>Squid 3.4.11 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.4.10 for testing.
+The Squid Team are pleased to announce the release of Squid-3.4.11 for testing.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v3/3.4/"> or the
  <url url="http://www.squid-cache.org/Mirrors/http-mirrors.html" name="mirrors">.

diff --git a/doc/release-notes/release-3.5.sgml b/doc/release-notes/release-3.5.sgml
index 7d103acbee4ff78b5c92e8152690a4549df5ee97..2af8cd9a7c7509c17ce2862155e80b36a974d816 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.0.4 release notes</title>
+<title>Squid 3.5.1 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.0.4 for testing.
+The Squid Team are pleased to announce the release of Squid-3.5.1 for testing.
 
 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/Mirrors/http-mirrors.html" name="mirrors">.