------------------------------------------------------------
revno: 13054
tags: SQUID_3_4_1
revision-id: squid3@treenet.co.nz-20131209012011-a4nvkqi3fcgdkjda
parent: squid3@treenet.co.nz-20131209010423-z5yd2kpq74q8tje4
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.4
timestamp: Sun 2013-12-08 18:20:11 -0700
message:
  3.4.1
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20131209012011-a4nvkqi3fcgdkjda
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: 16fbb163be6e6c961f6d4df8778252b4dfc08515
# timestamp: 2013-12-09 01:43:10 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squid3@treenet.co.nz-20131209010423-\
#   z5yd2kpq74q8tje4
# 
# Begin patch
=== modified file 'ChangeLog'
--- ChangeLog	2013-11-30 13:18:50 +0000
+++ ChangeLog	2013-12-09 01:20:11 +0000
@@ -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

=== modified file 'configure.ac'
--- configure.ac	2013-11-30 13:19:32 +0000
+++ configure.ac	2013-12-09 01:20:11 +0000
@@ -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)

=== modified file 'doc/release-notes/release-3.4.sgml'
--- doc/release-notes/release-3.4.sgml	2013-11-30 13:18:50 +0000
+++ doc/release-notes/release-3.4.sgml	2013-12-09 01:20:11 +0000
@@ -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 @@
 
 <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 @@
     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: