Prep for 3.2.10 and 3.3.4

diff --git a/ChangeLog b/ChangeLog
index 505f7a06bf3ab6b142443f5a0f23f4db46c7d8ee..7ad219de3a9a2f770e5e29663e89c2aecca5792a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+
+Changes to squid-3.3.4 (27 Apr 2013):
+
+       - Bug 3831: basic_ncsa_auth Blowfish and SHA support
+       - Bug 3816: SSL_get_certificate call inside Ssl::verifySslCertificate crashes
+       - Bug 3794: MacOS: workaround compiler errors and case-insensitivity
+       - Bug 3781: Proxy Authentication not sent to cache_peer
+       - Bug 3720 pt1: SourceLayout: shuffle fd_table definition into fde.h
+       - Bug 3720 pt2: Add missing include in /dev/poll I/O module
+       - Bug 3674: Improve compiler detection, better support warnings-as-errors on clang
+       - Add support for TPROXY on BSD
+       - Fix SSL Bump bypass for intercepted traffic
+       - Fix memory leaks in ConnStateData pinning
+       - Fix external_acl.cc "inBackground" assertion on queue overloads
+       - CacheMgr: fix missing column separator in helper stats
+       - OpenBSD: libpthreads requires OpenBSD 5.2 or later
+       - ... and lots of documentation updates
+       - ... and all changes from squid 3.2.10
+
 Changes to squid-3.3.3 (12 Mar 2013):
 
        - Bug 3720: Add missing include in /dev/poll I/O module (pt2)
@@ -55,6 +74,19 @@ Changes to squid-3.3.0.1 (21 Oct 2012):
        - ... and many compile error fixes
        - ... and a very large amount of code polish for faster compilation
 
+Changes to squid-3.2.10 (27 Apr 2013):
+
+       - Bug 3833: squidclient: Option '-k' is not present in man(1) page
+       - Bug 3825: basic_ncsa_auth: segfaulting with glibc-2.17
+       - Bug 3822: Locate LDAP and SASL headers for BSD support
+       - Bug 3817: Memory leak in SSL cert validate for alt_name peer certs
+       - Bug 3774: 'squid -k reconfigure' drops rock cache
+       - Bug 3565: Resuming postponed accept kills Squid
+       - HTTP/1.1: partial support for no-cache and private controls with parameters
+       - ssl_crtd: fix helpers dying during startup on ARM
+       - GNU Hurd: define MAP_NORESERVE as no-op when missing
+       - BSD: fix enter_suid/leave_suid build errors in ip/Intercept.cc
+
 Changes to squid-3.2.9 (12 Mar 2013):
 
        - Regression fix: Accept-Language header parse

diff --git a/doc/release-notes/release-3.2.sgml b/doc/release-notes/release-3.2.sgml
index dc955e2ea85048cd2c60b3f422383bec836b7192..c294f0456fe9478e38043474b9f15fefed315a47 100644 (file)
--- a/doc/release-notes/release-3.2.sgml
+++ b/doc/release-notes/release-3.2.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 3.2.9 release notes</title>
+<title>Squid 3.2.10 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.2.9.
+The Squid Team are pleased to announce the release of Squid-3.2.10.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v3/3.2/"> or the
  <url url="http://www.squid-cache.org/Mirrors/http-mirrors.html" name="mirrors">.

diff --git a/doc/release-notes/release-3.3.sgml b/doc/release-notes/release-3.3.sgml
index 9a01a9d968e0b194dbcde74e8c4bbddccdf059a3..4323980f542d5e27e83362e211329da1b1699f19 100644 (file)
--- 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.3 release notes</title>
+<title>Squid 3.3.4 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.3.
+The Squid Team are pleased to announce the release of Squid-3.3.4.
 
 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">.