Prep for 4.0.18

diff --git a/ChangeLog b/ChangeLog
index 47fed9657d7a0ff51b2d5982021ca717aba2379e..8e5e5abe3fe96a64df7c2bbd9858e8cc0344d20d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Changes to squid-4.0.18 (06 Feb 2017):
+
+       - Bug 4661: compile error 'warning: _XPG4_2 redefined' with GCC on Solaris 10
+       - Bug 4636: assertion 'byteCount > 0 && byteCount <= inBuf.length()'
+       - Bug 4610 partial: compile errors on Solaris 11.3 with Oracle Studio 12.5
+       - Bug 4599: support OpenSSL 1.1
+       - squidclient: link GnuTLS library debugs to -v level display
+       - Fix GCC6: unused local variable 'weInitiatedThisClosure'
+       - ... and some code polishing
+       - ... and some copyright updates
+       - ... and all fixes from 3.5.24
+
 Changes to squid-4.0.17 (16 Dec 2016):
 
        - Bug 4630: user credentials cache cleanup not re-scheduled

diff --git a/doc/release-notes/release-4.sgml b/doc/release-notes/release-4.sgml
index f9d578b94c4b2520a34ae1f380a394acd60d01e5..8b6c9126e9bf799b7f491f275a8d3153b72cb99a 100644 (file)
--- a/doc/release-notes/release-4.sgml
+++ b/doc/release-notes/release-4.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 4.0.17 release notes</title>
+<title>Squid 4.0.18 release notes</title>
 <author>Squid Developers</author>
 
 <abstract>
@@ -12,7 +12,7 @@ for Applied Network Research and members of the Web Caching community.
 <toc>
 
 <sect>Notice
-<p>The Squid Team are pleased to announce the release of Squid-4.0.17 for testing.
+<p>The Squid Team are pleased to announce the release of Squid-4.0.18 for testing.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v4/"> or the
  <url url="http://www.squid-cache.org/Download/http-mirrors.html" name="mirrors">.