From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 14 Mar 2010 04:58:00 +0000 (+1300)
Subject: Prep for 3.1.0.18
X-Git-Tag: SQUID_3_2_0_1~369
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e09692bd74c242b64e1e10f462ed98e247f48110;p=thirdparty%2Fsquid.git

Prep for 3.1.0.18
---

diff --git a/ChangeLog b/ChangeLog
index 7fdcc65875..f770458364 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Changes to squid-3.1.0.18 (14 Mar 2010):
+
+	- Regression Fix: IPv4-mapped prefix, broken in 3.1.0.16
+	- Bug 2869: Remove unused external reference
+	- Bug 2866: Support OpenSSL 1.0
+	- Bug 2813: Random unix_group crash at startup
+	- Send HTTP1.1 compliant 417 responses
+	- Associate external acl message with the request
+	- Various Digest parser fixes
+	- ... and all bug fixes from 3.0 up to 3.0.STABLE25
+
 Changes to squid-3.1.0.17 (24 Feb 2010):
 
 	- Regression Fix: Non-English error page UTF encoding
diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml
index d2fb8ad700..c864114011 100644
--- a/doc/release-notes/release-3.1.sgml
+++ b/doc/release-notes/release-3.1.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 3.1.0.17 release notes</title>
+<title>Squid 3.1.0.18 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.1.0.17 for testing.
+The Squid Team are pleased to announce the release of Squid-3.1.0.18 for testing.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v3/3.1/"> or the <url url="http://www.squid-cache.org/Mirrors/http-mirrors.html" name="mirrors">.