3.5.26

diff --git a/ChangeLog b/ChangeLog
index 91240b1792dff2472c599ba7286986e8ff358184..37032025d84cf855f4b35e79d0ebca311d91e7bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Changes to squid-3.5.26 (01 Jun 2017):
+
+       - Bug 4711: SubjectAlternativeNames is missing in some generated certificates
+       - Bug 4695: squidpurge: GCC 7 build errors
+       - Bug 4682: ignoring http_access deny when client-first bumping mode is used
+       - Bug 4682: Fix ssl_bump "bump" action documentation
+       - Bug 4653: %st lies about tunneled traffic volumes
+       - Bug 4589: ssl_crtd: returning zero on failure
+       - Bug 3772: message from FTP server gets mangled
+       - Bug 3102: FTP directory listing drops fist character of file names
+       - Add OpenSSL library details to -v output
+       - ... and some documentatino updates
+
 Changes to squid-3.5.25 (02 Apr 2017):
 
        - Bug 4688: various typo error(s) in man page(s)

diff --git a/configure.ac b/configure.ac
index 4c793aa18c5d0ad7156dae3ae6d8af46496be963..099d483d67ceb559adf109468330050270656c3a 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.25-BZR],[http://bugs.squid-cache.org/],[squid])
+AC_INIT([Squid Web Proxy],[3.5.26-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 087d16266076fc0e7925f4a77cf040269a4e0a2c..e69d3ed1f1efd4c4e00f06bf3c667451e692dd46 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.25 release notes</title>
+<title>Squid 3.5.26 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.25.
+The Squid Team are pleased to announce the release of Squid-3.5.26.
 
 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">.