From 3896e584d7eeb321d7becbcedec872ffa868dd87 Mon Sep 17 00:00:00 2001
From: squidadm <squidadm@users.noreply.github.com>
Date: Mon, 5 Jul 2021 22:09:36 +1200
Subject: [PATCH] 4.16 (#852)

---
 ChangeLog                        | 7 +++++++
 configure.ac                     | 2 +-
 doc/release-notes/release-4.sgml | 5 +++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bc117d6f8d..f826bf3344 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Changes in squid-4.16 (04 Jul 2021):
+
+	- Regression Fix: --with-valgrind-debug build broken since 4.15
+	- Bug 5129 pt1: remove Lock use from HttpRequestMethod
+	- Bug 5128: Translation: Fix '% i' typo in es/ERR_FORWARDING_DENIED
+	- Bug 4528: ICAP transactions quit on async DNS lookups
+
 Changes in squid-4.15 (10 May 2021):
 
 	- Bug 5112: Excessively loud chunked reply parsing error reporting
diff --git a/configure.ac b/configure.ac
index 70047ed499..d22a120dad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-AC_INIT([Squid Web Proxy],[4.15-VCS],[http://bugs.squid-cache.org/],[squid])
+AC_INIT([Squid Web Proxy],[4.16-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-4.sgml b/doc/release-notes/release-4.sgml
index 89093e56f9..0130a695ba 100644
--- 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.15 release notes</title>
+<title>Squid 4.16 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.15.
+<p>The Squid Team are pleased to announce the release of Squid-4.16.
 
 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">.
@@ -392,6 +392,7 @@ This section gives a thorough account of those changes in three categories:
 	<p>New <em>tls-default-ca</em> option to use the system Trusted CAs to
 	   verify the server certificate.
 	<p>New <em>tls-domain=</em> option to verify the server certificate domain.
+	<p>Squid-4.16 improved support for hostnames in ICAP service URLs.
 
 	<tag>logfile_daemon</tag>
 	<p>Now only requires that helper binary exists when daemon: log module
-- 
2.47.2