3.4.1

diff --git a/ChangeLog b/ChangeLog
index 22fbe3034c9bdc9781793677b5121fd3f8d674d8..22a59ab989ed184ea26297b106da9d0a4e2bb8f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Changes to squid-3.4.1 (09 Dec 2013):
+
+       - Bug 3935: Invalid pointer dereference when peeking at origin server certificate
+       - Bug 3589: intercepted and ICAP modified request using a cache_peer
+       - ... and several portability fixes
+       - ... and some documentation updates
+
 Changes to squid-3.4.0.3 (01 Dec 2013):
 
        - Bug 3941: Release notes error

diff --git a/configure.ac b/configure.ac
index 90c1c32e7f4db76db18a976646e94131324647cf..eb10e097fe9754fd20ebdad3d9105125260d38b5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Squid Web Proxy],[3.4.0.3-BZR],[http://bugs.squid-cache.org/],[squid])
+AC_INIT([Squid Web Proxy],[3.4.1-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.4.sgml b/doc/release-notes/release-3.4.sgml
index 584f35a390b0507c5dd74f51c6ee91e31b6efba8..c44d05a575057d68e412838e0efaf48da8ce4a22 100644 (file)
--- a/doc/release-notes/release-3.4.sgml
+++ b/doc/release-notes/release-3.4.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 3.4.0.3 release notes</title>
+<title>Squid 3.4.1 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.4.0.3 for testing.
+The Squid Team are pleased to announce the release of Squid-3.4.1 for testing.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v3/3.4/"> or the
  <url url="http://www.squid-cache.org/Mirrors/http-mirrors.html" name="mirrors">.
@@ -206,7 +206,7 @@ There have been changes to Squid's configuration file since Squid-3.3.
     acl whitelist dstdomain parameters("/etc/squid/whitelist.txt")
 </verb>
 
-<p>There hasve also been changes to individual directives in the config file.
+<p>There have also been changes to individual directives in the config file.
 
 This section gives a thorough account of those changes in three categories: