Prep for 3.5.5

diff --git a/ChangeLog b/ChangeLog
index e812a89b71ac87353fcd291c78a236736f0d23f8..707bda828ccfe150d21367d19a9f525bcc268563 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Changes to squid-3.5.5 (28 May 2015):
+
+       - Regression Bug 4132: short_icon_urls with global_internal_static on
+       - Bug 4238: assertion Read.cc:205: "params.data == data"
+       - Bug 4236: SSL negotiation error of 'success'
+       - Bug 3930: assertion 'connIsUsable(http->getConn())'
+       - Fix assertion MemBuf.cc:380: "new_cap > (size_t) capacity" in SSL I/O buffer
+       - Fix assertion errorpage.cc:600: "entry->isEmpty()"
+       - Fix comm_connect_addr on failures returns Comm:OK
+       - Fix missing external ACL helper notes
+       - Fix "Not enough space to hold server hello message" error message
+       - Fix segmentation fault inside Adaptation::Icap::Xaction::swanSong
+       - Prevent unused ssl_crtd helpers being run
+       - ... and some code cleanup and portability updates
+       - ... and several documentation updates
+
 Changes to squid-3.5.4 (01 May 2015):
 
        - Bug 4234: comm_connect_addr uses errno incorrectly

diff --git a/doc/release-notes/release-3.5.sgml b/doc/release-notes/release-3.5.sgml
index b0311c50eadec37314e10e21cbabb82b2e9d9f08..6ed074e327d9979301d0143dbccf85d294a11dbf 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.4 release notes</title>
+<title>Squid 3.5.5 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.4.
+The Squid Team are pleased to announce the release of Squid-3.5.5.
 
 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">.