Prep for 3.4.6

diff --git a/ChangeLog b/ChangeLog
index 0df33affba24a5f3fe7647abcaf741aea3abe3a1..b688b5a0fb737e78e3433f75123616e8f91f12b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Changes to squid-3.4.6 (25 Jun 2014):
+
+       - Regression: segmentation fault logging with %tg format specifier
+       - Bug 4065: round-robin neighbor selection with unequal weights
+       - Bug 4056: assertion MemPools[type] from netdbExchangeStart()
+       - Bug 4050: segmentation fault in CommSelectEngine::checkEvents on helper response
+       - Fix segmentation fault setting up server SSL connnection
+       - Fix hanging Non-HTTPS connections on SSL-bump enabled port
+       - Fix Cache Manager actions listed more than once
+       - ... and many minor memory leaks
+       - ... and several portability build issues
+       - ... and some documentation updates
+
 Changes to squid-3.4.5 (02 May 2014):
 
        - Regression Bug 4051: inverted test on CONNECT payload existence

diff --git a/doc/release-notes/release-3.4.sgml b/doc/release-notes/release-3.4.sgml
index cd2310070b156e2f10f5682e6c8b36899f227fde..fb57eeea0cdaaa59ab007ba88de75847904cdc5e 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.5 release notes</title>
+<title>Squid 3.4.6 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.5 for testing.
+The Squid Team are pleased to announce the release of Squid-3.4.6 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">.