From 2c7246f7c85cfb9d6f11ff61d4ef5567172d3bf3 Mon Sep 17 00:00:00 2001
From: Amos Jeffries <yadij@users.noreply.github.com>
Date: Sat, 4 Aug 2018 19:40:10 +0000
Subject: [PATCH] Prep for 4.2 (#268)

Assuming that PR 247 is merged within the next day
and backported with this.
---
 ChangeLog                        | 13 +++++++++++++
 doc/release-notes/release-4.sgml |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0de844868f..558d26c616 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Changes to squid-4.2 (04 Aug 2018):
+
+	- Regression fix: support for https_port clientca= option
+	- Regression Bug 4870: milliseconds logformats prepend 0s instead of spaces
+	- Bug 4861: HTTPMSGLOCK missing pointer safety
+	- Bug 4843 pt3: GCC-8 fixes and refactoring
+	- HTTP: Do not update stored headers on 304 responses
+	- Fix segmentation fault on -k parse
+	- Fix %>ru logging of huge URLs
+	- ... and several performance optimizations
+	- ... and some documentation updates
+	- ... and all fixes from 3.5.28
+
 Changes to squid-4.1 (02 Jul 2018):
 
 	- Bug 4223: fixed retries of failed re-forwardable transactions
diff --git a/doc/release-notes/release-4.sgml b/doc/release-notes/release-4.sgml
index cfaf96ef28..d0c16bc493 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.1 release notes</title>
+<title>Squid 4.2 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.1 for testing.
+<p>The Squid Team are pleased to announce the release of Squid-4.2 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">.
-- 
2.47.2