3.5.25

diff --git a/ChangeLog b/ChangeLog
index 05d3524cbf3fbefed1492b402b28ae716de977fc..91240b1792dff2472c599ba7286986e8ff358184 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Changes to squid-3.5.25 (02 Apr 2017):
+
+       - Bug 4688: various typo error(s) in man page(s)
+       - Bug 4508: Host forgery stalls intercepted being-spliced connections
+       - Native FTP relay: NAT and TPROXY interception fixes
+       - Fix missing CRLF on FTP timeout ABORT commands
+       - TLS: Bump client on errors encountered before ssl_bump evaluation
+       - ext_kerberos_ldap_group_acl: fix unused value warnings
+       - Fix crash when configuring with invalid delay_parameters restore value.
+       - Check that -k argument is provided before trying to use it.
+       - ... and some build fixes
+
 Changes to squid-3.5.24 (28 Jan 2017):
 
        - Regression Bug 3940: Make 'cache deny' do what is documented

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