------------------------------------------------------------ revno: 11739 tags: SQUID_3_2_5 revision-id: squid3@treenet.co.nz-20121210095241-nawf0n40aws1gx2a parent: squid3@treenet.co.nz-20121202212528-325b660umtfx9qq0 committer: Amos Jeffries branch nick: 3.2 timestamp: Mon 2012-12-10 02:52:41 -0700 message: 3.2.5 ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20121210095241-nawf0n40aws1gx2a # target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ # /SQUID_3_2 # testament_sha1: c21211ae03b5ac77d0144dbd8baef9b95966a3d6 # timestamp: 2012-12-10 09:53:50 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ # /SQUID_3_2 # base_revision_id: squid3@treenet.co.nz-20121202212528-\ # 325b660umtfx9qq0 # # Begin patch === modified file 'ChangeLog' --- ChangeLog 2012-12-02 09:22:41 +0000 +++ ChangeLog 2012-12-10 09:52:41 +0000 @@ -1,3 +1,7 @@ +Changes to squid-3.2.5 (10 Dec 2012): + + - Bug 3698: Add missing include of errno.h + Changes to squid-3.2.4 (03 Dec 2012): - Ported: urllogin ACL from squid 2.7 === modified file 'configure.ac' --- configure.ac 2012-12-02 09:22:41 +0000 +++ configure.ac 2012-12-10 09:52:41 +0000 @@ -1,9 +1,4 @@ -dnl -dnl $Id$ -dnl -dnl -dnl -AC_INIT([Squid Web Proxy],[3.2.4-BZR],[http://www.squid-cache.org/bugs/],[squid]) +AC_INIT([Squid Web Proxy],[3.2.5-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.2.html' --- doc/release-notes/release-3.2.html 2012-12-02 09:22:41 +0000 +++ doc/release-notes/release-3.2.html 2012-12-10 09:52:41 +0000 @@ -2,10 +2,10 @@ - Squid 3.2.4 release notes + Squid 3.2.5 release notes -

Squid 3.2.4 release notes

+

Squid 3.2.5 release notes

Squid Developers

@@ -72,7 +72,8 @@

1. Notice

-

The Squid Team are pleased to announce the release of Squid-3.2.4 for testing.

+

The Squid Team are pleased to announce the release of Squid-3.2.5 for +testing.

This new release is available for download from http://www.squid-cache.org/Versions/v3/3.2/ or the mirrors.

=== modified file 'doc/release-notes/release-3.2.sgml' --- doc/release-notes/release-3.2.sgml 2012-12-02 09:22:41 +0000 +++ doc/release-notes/release-3.2.sgml 2012-12-10 09:52:41 +0000 @@ -1,6 +1,6 @@
-Squid 3.2.4 release notes +Squid 3.2.5 release notes Squid Developers @@ -13,7 +13,8 @@ Notice

-The Squid Team are pleased to announce the release of Squid-3.2.4 for testing. +The Squid Team are pleased to announce the release of Squid-3.2.5 for +testing. This new release is available for download from or the .