From 060539a0679915854774df05376bd8abe9f8eeb7 Mon Sep 17 00:00:00 2001
From: Amos Jeffries <yadij@users.noreply.github.com>
Date: Mon, 1 Oct 2018 07:57:54 +1300
Subject: [PATCH] 4.3 (#298)

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

diff --git a/ChangeLog b/ChangeLog
index 558d26c616a..210b063b951 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Changes to squid-4.3 (01 Oct 2018):
+
+	- Bug 4885: Excessive memory usage when running out of descriptors
+	- Bug 4877: Add missing text about external_acl_type %DATA changes
+	- Bug 4875 pt1: GCC-8 compile errors with -O3 optimization
+	- Bug 4716: Blank lines in cachemgr.conf are not skipped
+	- Bug 4691: balance_on_multiple_ip config option docs
+	- basic_pop3_auth: fix startup errors
+	- langpack: Add missing dialect aliases
+	- Fix range_offset_limit debugging
+	- Fix icc build errors
+	- Update systemd dependencies in squid.service
+
 Changes to squid-4.2 (04 Aug 2018):
 
 	- Regression fix: support for https_port clientca= option
diff --git a/configure.ac b/configure.ac
index daa3e9606ea..9a72ed48dbb 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.2-VCS],[http://bugs.squid-cache.org/],[squid])
+AC_INIT([Squid Web Proxy],[4.3-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 dfa0957bc2d..8cda38b0233 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.2 release notes</title>
+<title>Squid 4.3 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.2 for testing.
+<p>The Squid Team are pleased to announce the release of Squid-4.3 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">.