Prep for 3.1.21

diff --git a/ChangeLog b/ChangeLog
index 62aa30cd87da40dc0b1aa6eef927054263f553d7..aa4f31e2ed0966a3a7b44b5d8d075c5ce1326655 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -405,6 +405,24 @@ Changes to squid-3.2.0.1 (03 Aug 2010):
        - ... and a great many testing improvements
        - ... and many documentation updates
 
+Changes to squid-3.1.21 (23 Sep 2012):
+
+       - Bug 3622: peerClearRRStart scheduling multiple events
+       - Bug 3615: configure check for default max number of FDs is broken
+       - Bug 3607: --enable-auth documented default action incorrect
+       - Bug 3593: socket failure: Address family not supported by protocol
+       - Bug 3584: Detection of setresuid() is broken
+       - Bug 3568: Consolidate external_acl_type config dumping and add missing %%
+       - Bug 3564: eCAP not supporting CoAP URI schemes
+       - Bug 3484: Docs: sslproxy_cert_error example flawed
+       - Bug 3462: Delay Pools and ICAP
+       - Bug 3133: better fix: Memory leak handling requests for sites that don't exist
+       - Bug 2976: ERR_INVALID_URL for transparently captured requests when reconfiguring
+       - Silence IOS 15.1 unknown capabilities messages.
+       - Account for Store disk client quota when bandwidth-limiting the server.
+       - ... and several documentation fixes
+       - ... and several compile fixes
+
 Changes to squid-3.1.20 (08 Jun 2012):
 
        - Regression Bug 3545: FreeBSD dnsserver segfaults

diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml
index 814c42a8565ad0733f1ed4684c008f62a4abd73b..41ba10edb12f91afc64fc0a2cd1ed40a7e22ec67 100644 (file)
--- 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.20 release notes</title>
+<title>Squid 3.1.21 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.20
+The Squid Team are pleased to announce the release of Squid-3.1.21
 
 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">.