From 3f5d044d9a4873b3c769d13c43d5d3f9bfe258a3 Mon Sep 17 00:00:00 2001
From: Amos Jeffries <yadij@users.noreply.github.com>
Date: Sun, 23 Aug 2020 06:37:05 +1200
Subject: [PATCH] 4.13 (#718)

---
 ChangeLog                        | 12 ++++++++++++
 configure.ac                     |  2 +-
 doc/release-notes/release-4.sgml |  6 +++---
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 979f2f3e02..bcf416aa15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Changes to squid-4.13 (23 Aug 2020):
+
+	- Regression Fix: Support parsing GREASEd (and future) TLS handshakes
+	- Bug 5051: Some collapsed revalidation responses never expire
+	- HTTP: Enforce token characters for field-name
+	- HTTP: Forbid obs-fold and bare CR whitespace in framing header fields
+	- HTTP: Improve Transfer-Encoding handling
+	- WCCP: Fix GCC-10 -Wstringop-truncation failures
+	- Honor on_unsupported_protocol for intercepted https_port
+	- Fix livelocking in peerDigestHandleReply
+	- Do not stall while debugging a scan of an empty store_table
+
 Changes to squid-4.12 (05 Jun 2020):
 
 	- Regression Fix: Revert to slow search for new SMP shm pages
diff --git a/configure.ac b/configure.ac
index a5fc6663da..02867a12aa 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.12-VCS],[http://bugs.squid-cache.org/],[squid])
+AC_INIT([Squid Web Proxy],[4.13-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 5f0eb1c7c7..a75040fb64 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.12 release notes</title>
+<title>Squid 4.13 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.12.
+<p>The Squid Team are pleased to announce the release of Squid-4.13.
 
 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">.
@@ -59,7 +59,7 @@ Most user-facing changes are reflected in squid.conf (see below).
 
 
 <sect1>Configurable helper queue size
-<p>The new queue-size=N option to helpers configuration, allows users 
+<p>The new <em>queue-size=N</em> option to helpers configuration, allows users
    to configure the maximum number of queued requests to busy helpers.
 
 <sect1>Helper concurrency channels changes
-- 
2.47.2