commit a4e3feca42f13e696d387a368147fff8b70c75e4 Author: Sebastian Hahn sebastian@torproject.org Date: Mon Jan 30 21:31:37 2012 +0100

Update to zlib 1.2.6

Looks like nothing we need to urgently fix, but the download would fail otherwise --- README.LINUX-2.2 | 2 +- README.OSX-2.2 | 2 +- README.WIN-2.2 | 2 +- build-scripts/linux.mk | 2 +- build-scripts/versions.mk | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 3466964..8f0323f 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,7 +5,7 @@ Included applications ---------------------

Vidalia 0.2.15 (with Qt 4.7.4) -Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0g) +Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.6 and openssl-1.0.0g) Firefox 10.0 _ Torbutton 1.4.5.1 |_ NoScript 2.2.8 diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 56fb53a..c208895 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,7 +5,7 @@ Included applications ---------------------

Vidalia 0.2.15 (with Qt 4.7.4) -Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0g) +Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.6 and openssl-1.0.0g) Firefox 10.0 _ Torbutton 1.4.5.1 |_ NoScript 2.2.8 diff --git a/README.WIN-2.2 b/README.WIN-2.2 index b586bd5..9d466c1 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,7 +5,7 @@ Included applications ---------------------

Vidalia 0.2.15 (with Qt 4.7.4) -Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.5 and openssl-1.0.0g) +Tor 0.2.2.35 (with libevent-2.0.16-stable, zlib-1.2.6 and openssl-1.0.0g) Firefox 10.0 _ Torbutton 1.4.5.1 |_ NoScript 2.2.8 diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 6bf7391..badb523 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -282,7 +282,7 @@ install-binaries: cp -d $(QT)/libQtNetwork.so* $(LIBSDIR) cp -d $(QT)/libQtXml.so* $(LIBSDIR) # zlib - cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.5 $(LIBSDIR)/libz + cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.6 $(LIBSDIR)/libz # Libevent cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.4 $(LIBEVENT)/libevent_core.so \ $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.4 \ diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 1de9ad5..3fc350c 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -14,7 +14,7 @@ QT_VER=4.7.4 TOR_VER=0.2.2.35 TORBUTTON_VER=1.4.5.1 VIDALIA_VER=0.2.15 -ZLIB_VER=1.2.5 +ZLIB_VER=1.2.6

## Extension IDs FF_VENDOR_ID:={ec8030f7-c20a-464f-9b0e-13a3a9e97384}