Prep for 3.4.2

diff --git a/ChangeLog b/ChangeLog
index 22a59ab989ed184ea26297b106da9d0a4e2bb8f5..a0050e700ee8ba0bb3ab480186f9909c6f6b0d72 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Changes to squid-3.4.2 (30 Dec 2013):
+
+       - Regression Bug 3980: FATAL ERROR due to max_user_ip -s option
+       - Regression Fix: \-unescaping in quoted strings from helpers
+       - Regression Fix: URL helper API bypassing on URL containing '=' character
+       - Bug 3985: 60s limit introduced by balance_on_multiple_ip breaks bad IP recovery
+       - Bug 3806: Caching responses with Vary header
+       - Bug 3498: FTP PUT assertion
+       - WCCPv2: Fix assertion 'Cannot convert non-IPv4 to IPv4' on FreeBSD
+       - Enable concurrency by default for SSL certificate validator
+       - ... and fix several build errors
+
 Changes to squid-3.4.1 (09 Dec 2013):
 
        - Bug 3935: Invalid pointer dereference when peeking at origin server certificate

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