From: Amos Jeffries <yadij@users.noreply.github.com>
Date: Sun, 6 Feb 2022 20:40:05 +0000 (+0000)
Subject: Prep for 5.4 (#973)
X-Git-Tag: SQUID_6_0_1~239
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f019e78d1208ac750665bc98b67df83c0b60b48;p=thirdparty%2Fsquid.git

Prep for 5.4 (#973)
---

diff --git a/ChangeLog b/ChangeLog
index 9dca6779f8..978047e962 100644
--- 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/doc/release-notes/release-5.sgml b/doc/release-notes/release-5.sgml
index f98665af50..80303764c4 100644
--- 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">.