3.5.12

diff --git a/ChangeLog b/ChangeLog
index 10d74bb2a0e5e571a1e01c84b0eda1a39e1a78c1..7cf3904fc6a5f2b26c34d4b3806e31b6086b1f73 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Changes to squid-3.5.12 (28 Nov 2015):
+
+       - Bug 4374: refresh_pattern config parser (%)
+       - Bug 4373: assertion 'calloutContext->redirect_state == REDIRECT_NONE'
+       - Bug 4228: links with krb5 libs despite --without options
+       - Fix SSL_get_certificate() problem detection
+       - Fix TLS handshake problem during Renegotiation
+       - Fix cache_peer forceddomain= in CONNECT
+       - Fix status code-based HTTP reason phrase for eCAP-generated messages
+       - Fix build errors in cpuafinity.cc
+       - ... and several documentation updates
+
 Changes to squid-3.5.11 (01 Nov 2015):
 
        - Bug 3574: crashes on reconfigure and startup

diff --git a/configure.ac b/configure.ac
index 8542f1db08038dcee1fdcda2f2f74b8744096144..a9ad4efe33e5fde2a41daddb2e8edaa5e991a920 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-AC_INIT([Squid Web Proxy],[3.5.11-BZR],[http://bugs.squid-cache.org/],[squid])
+AC_INIT([Squid Web Proxy],[3.5.12-BZR],[http://bugs.squid-cache.org/],[squid])
 AC_PREREQ(2.61)
 AC_CONFIG_HEADERS([include/autoconf.h])
 AC_CONFIG_AUX_DIR(cfgaux)

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