5.4 (#976)

diff --git a/ChangeLog b/ChangeLog
index 9dca6779f8c86b6544eb4a78767f1f03d68ce4d0..978047e96230d661456f1b56d61a061829c0c22c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Changes in squid-5.4 (07 Feb 2021):
+
+       - Bug 5190: Preserve configured order of intermediate CA certificate chain
+       - Bug 5188: Fix reconfiguration leaking tls-cert=... memory
+       - Bug 5187: Properly track (and mark) truncated store entries
+       - Bug 5134: assertion failed: Transients.cc:221: "old == e"
+       - Bug 5132: Close the tunnel if to-server conn closes after client
+       - langpack: Fix typo in Russian texts
+       - copyright years and CONTRIBUTORS update
+
 Changes in squid-5.3 (06 Dec 2021):
 
        - Bug 5169: StoreMap.cc:517 "!s.reading()" assertion

diff --git a/configure.ac b/configure.ac
index dd43f68e2651357dd0285a74ef9f515841873f49..8aab5c5f9e066da2bdf941f3c566f59b25bf8b8d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-AC_INIT([Squid Web Proxy],[5.3-VCS],[http://bugs.squid-cache.org/],[squid])
+AC_INIT([Squid Web Proxy],[5.4-VCS],[http://bugs.squid-cache.org/],[squid])
 AC_PREREQ(2.61)
 AC_CONFIG_HEADERS([include/autoconf.h])
 AC_CONFIG_AUX_DIR(cfgaux)

diff --git a/doc/release-notes/release-5.sgml b/doc/release-notes/release-5.sgml
index 2ba48b583f1403545b60c1a558b85441344e58a5..3b2c26798f3ceb162e65c771189808cdd12ed49a 100644 (file)
--- a/doc/release-notes/release-5.sgml
+++ b/doc/release-notes/release-5.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 5.3 release notes</title>
+<title>Squid 5.4 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-5.3.
+<p>The Squid Team are pleased to announce the release of Squid-5.4.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v5/"> or the
  <url url="http://www.squid-cache.org/Download/http-mirrors.html" name="mirrors">.