From 1a39473b39ba9a42d851c7bf514dc51f61c3107c Mon Sep 17 00:00:00 2001
From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 30 Jun 2013 02:52:51 -0600
Subject: [PATCH] Prep for 3.3.6

---
 ChangeLog                          | 14 ++++++++++++++
 doc/release-notes/release-3.3.sgml |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index de399443ae..59cf06ce46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,18 @@
 
+Changes to squid-3.3.6 (01 Jul 2013):
+
+	- Bug 3854: pt1: compile errors on AIX
+	- Bug 3802: Fix wrong check inside Format::Format::assemble
+	- Bug #3762: remove bogus WARNING in cache.log
+	- Bug 3717: assertion failed with dstdom_regex with IP based URL
+	- Bug 1991: kqueue causes SSL to hang
+	- Ask for SSL key password when started with -N but without sslpassword_program
+	- Make sure %<tt includes all [failed] connection attempts
+	- Support HTTP reply ACLs in icap_log and log_icap
+	- Fix incorrect external_acl_type codes
+	- Fix ICAP logging request headers and segmentation faults
+	- ... and some documentation polish
+
 Changes to squid-3.3.5 (20 May 2013):
 
 	- Bug 3851: Delay Pool class 5 tag:levels displayed incorrectly in cache manager
diff --git a/doc/release-notes/release-3.3.sgml b/doc/release-notes/release-3.3.sgml
index bc88e57cdc..610bd9853b 100644
--- a/doc/release-notes/release-3.3.sgml
+++ b/doc/release-notes/release-3.3.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 3.3.5 release notes</title>
+<title>Squid 3.3.6 release notes</title>
 <author>Squid Developers</author>
 
 <abstract>
@@ -13,7 +13,7 @@ for Applied Network Research and members of the Web Caching community.
 
 <sect>Notice
 <p>
-The Squid Team are pleased to announce the release of Squid-3.3.5.
+The Squid Team are pleased to announce the release of Squid-3.3.6.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v3/3.3/"> or the 
 <url url="http://www.squid-cache.org/Mirrors/http-mirrors.html" name="mirrors">.
-- 
2.47.3