Prep for 3.5.0.4

diff --git a/ChangeLog b/ChangeLog
index 7ecfd216eb63bf21d2cb68a22c80cc9103b0cc66..9240152cf03fb163364a983365e0d1bf9cfcbad4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Changes to squid-3.5.0.4 (21 Dec 2014):
+
+       - Bug 3826: pt 2: Provide a systemd .service file for Squid
+       - Support http_access denials of SslBump "peeked" connections.
+       - Fix DONT_VERIFY_DOMAIN ssl flag
+       - Fix peek-and-splice mode: certificate validation for domain mismatched errors
+       - negotiate_kerberos_auth: MEMORY keytab and replay cache support
+       - ... and some documentation updates
+       - ... and a large amount of code polishing (non-logic changes)
+
 Changes to squid-3.5.0.3 (09 Dec 2014):
 
        - Bug 4146: workaround SSL Bump crash on Linux

diff --git a/doc/release-notes/release-3.5.sgml b/doc/release-notes/release-3.5.sgml
index 3a71fc97d42ca4795a1a448c1ec90d30d7eb50d6..e2b6d570eff73b7530e0bb78aacdf64f7ff2f7da 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.3 release notes</title>
+<title>Squid 3.5.0.4 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.3 for testing.
+The Squid Team are pleased to announce the release of Squid-3.5.0.4 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">.