Prep for 3.5.6

diff --git a/ChangeLog b/ChangeLog
index 707bda828ccfe150d21367d19a9f525bcc268563..94b26f4f0b046804e8f2253eeef2f5712d89e58e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Changes to squid-3.5.6 (03 Jul 2015):
+
+       - Bug 4274: ssl_crtd.8 not being installed
+       - Bug 4193: memory leak on FTP listings
+       - Bug 4183: segfault when freeing https_port clientca on reconfigure or exit
+       - Bug 3875: bad mimeLoadIconFile error handling
+       - Bug 3483: assertion failed store.cc:1866: 'isEmpty()'
+       - Bug 3329: pinned server connection is not closed properly
+       - TLS: Disable client-initiated renegotiation
+       - ext_edirectory_userip_acl: fix uninitialized variable
+       - Support custom OIDs in *_cert ACLs
+       - Fix CONNECT failover to IPv4 after trying broken IPv6 servers
+       - Use relative-URL in errorpage.css for SN.png
+       - Do not blindly forward cache peer CONNECT responses
+       - Fix assertion String.cc:221: "str"
+       - Fix assertion comm.cc:759: "Comm::IsConnOpen(conn)" in ConnStateData::getSslContextDone
+       - Translations: add Spanish US dialect alias
+
 Changes to squid-3.5.5 (28 May 2015):
 
        - Regression Bug 4132: short_icon_urls with global_internal_static on

diff --git a/doc/release-notes/release-3.5.sgml b/doc/release-notes/release-3.5.sgml
index 6ed074e327d9979301d0143dbccf85d294a11dbf..cb8af5847c9b1211baa12f38da75e12b9a45ec4f 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.5 release notes</title>
+<title>Squid 3.5.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.5.5.
+The Squid Team are pleased to announce the release of Squid-3.5.6.
 
 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/Download/http-mirrors.html" name="mirrors">.