Prep for 3.2.12 and 3.3.7

diff --git a/ChangeLog b/ChangeLog
index 8c9f7aa52f0005effa7fc89422a95ac71e24f8a9..043262ff337402b0a5c3859051c701869b9048bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,12 @@ Changes to squid-3.4.0.1 (-- --- 2013):
        - ... and many documentation changes
        - ... and much code cleanup and polishing
 
+Changes to squid-3.3.7 (11 Jul 2013):
+
+       - Bug 3297: Fix openSSL related build failures
+       - Fix build on FreeBSD 9.x platform with clang
+       - Protect against buffer overrun in DNS query generation
+
 Changes to squid-3.3.6 (01 Jul 2013):
 
        - Bug 3854: pt1: compile errors on AIX
@@ -145,6 +151,13 @@ Changes to squid-3.3.0.1 (21 Oct 2012):
        - ... and many compile error fixes
        - ... and a very large amount of code polish for faster compilation
 
+Changes to squid-3.2.12 (11 Jul 2013):
+
+       - Protect against buffer overrun in DNS query generation
+       - Avoid !closing assertions when helpers call comm_read during reconfigure.
+       - Fix several minor memory leaks during reconfigure
+       - Remove origin_tries limiter on forwarding and permit large max_forward_tries values
+
 Changes to squid-3.2.11 (30 Apr 2013):
 
        - Regression Bug 3839: build error: src/tools.h: No such file or directory

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

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