May 2012 - tor-commits - lists.torproject.org

[torbrowser/maint-2.2] update libevent library names in linux makefile
by erinn＠torproject.org 12 May '12

12 May '12

commit ad859b060ec77434eb9ea6d2733758f8aa84f73e Author: Erinn Clark <erinn(a)torproject.org> Date: Sat May 12 10:41:41 2012 -0300 update libevent library names in linux makefile --- build-scripts/linux.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 49d3d2e..8e424cb 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -248,9 +248,9 @@ install-binaries: # zlib 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.6 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.6 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.6 \ + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.7 $(LIBEVENT)/libevent_core.so \ + $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.7 \ + $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.7 \ $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 12 May '12

12 May '12

commit 85b9503ab572248e76cfb1dab7fbb7f9931e65c3 Merge: 14fe42a ad859b0 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat May 12 10:42:04 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 12 May '12

12 May '12

commit 85b9503ab572248e76cfb1dab7fbb7f9931e65c3 Merge: 14fe42a ad859b0 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat May 12 10:42:04 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

1 0

[torbrowser/master] update libevent library names in linux makefile
by erinn＠torproject.org 12 May '12

12 May '12

commit ad859b060ec77434eb9ea6d2733758f8aa84f73e Author: Erinn Clark <erinn(a)torproject.org> Date: Sat May 12 10:41:41 2012 -0300 update libevent library names in linux makefile --- build-scripts/linux.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 49d3d2e..8e424cb 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -248,9 +248,9 @@ install-binaries: # zlib 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.6 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.6 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.6 \ + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.7 $(LIBEVENT)/libevent_core.so \ + $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.7 \ + $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.7 \ $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng

1 0

[torbrowser/maint-2.3] update libevent library names in linux makefile
by erinn＠torproject.org 12 May '12

12 May '12

commit ad859b060ec77434eb9ea6d2733758f8aa84f73e Author: Erinn Clark <erinn(a)torproject.org> Date: Sat May 12 10:41:41 2012 -0300 update libevent library names in linux makefile --- build-scripts/linux.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 49d3d2e..8e424cb 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -248,9 +248,9 @@ install-binaries: # zlib 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.6 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.6 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.6 \ + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.7 $(LIBEVENT)/libevent_core.so \ + $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.7 \ + $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.7 \ $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng

1 0

[torbrowser/maint-2.2] Reset write attribute that 'sed --in-place' forgets to set.
by erinn＠torproject.org 12 May '12

12 May '12

commit 3dff6acbfc16e8e33211bc0806982751008aabd8 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Sat May 5 13:54:38 2012 +0200 Reset write attribute that 'sed --in-place' forgets to set. --- build-scripts/windows.mk | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 9d769dd..4cc2c67 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -388,6 +388,8 @@ patch-firefox-language: ./patch-firefox-language.sh $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js $(LANGCODE) sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js + chmod u+w $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js + chmod u+w $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js ### ### Utilities

1 0

[torbrowser/maint-2.2] bump all tbbs to 2.2.35-12 for openssl 1.0.1c, libevent 2.0.19-stable
by erinn＠torproject.org 12 May '12

12 May '12

commit d3b0d1bca00c6edf0966e654aaddcb9f222c9415 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 11 21:01:43 2012 -0300 bump all tbbs to 2.2.35-12 for openssl 1.0.1c, libevent 2.0.19-stable --- README.LINUX-2.2 | 4 ++-- README.OSX-2.2 | 4 ++-- README.WIN-2.2 | 4 ++-- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 9 +++++++++ changelog.osx-2.2 | 9 +++++++++ changelog.windows-2.2 | 9 +++++++++ 10 files changed, 37 insertions(+), 10 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index f6b803a..f379cce 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,10 +5,10 @@ Included applications --------------------- Vidalia 0.2.17 (with Qt 4.8.1) -Tor 0.2.2.35 (with libevent-2.0.18-stable, zlib-1.2.6 and openssl-1.0.1b) +Tor 0.2.2.35 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 12.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.3.9 + |_ NoScript 2.4.1 |_ HTTPS-Everywhere 2.0.2 Usage diff --git a/README.OSX-2.2 b/README.OSX-2.2 index ccb11c1..ebe97b4 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,10 +5,10 @@ Included applications --------------------- Vidalia 0.2.17 (with Qt 4.8.1) -Tor 0.2.2.35 (with libevent-2.0.18-stable, zlib-1.2.6 and openssl-1.0.1b) +Tor 0.2.2.35 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 12.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.3.9 + |_ NoScript 2.4.1 |_ HTTPS-Everywhere 2.0.2 Usage diff --git a/README.WIN-2.2 b/README.WIN-2.2 index bb9c1b8..a3bac24 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,10 +5,10 @@ Included applications --------------------- Vidalia 0.2.17 (with Qt 4.8.1) -Tor 0.2.2.35 (with libevent-2.0.18-stable, zlib-1.2.6 and openssl-1.0.1b) +Tor 0.2.2.35 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 12.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.3.9 + |_ NoScript 2.4.1 |_ HTTPS-Everywhere 2.0.2 Usage diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 0584ec7..49d3d2e 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=11 +BUILD_NUM=12 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 2a4c704..bfc628d 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=11 +BUILD_NUM=12 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index eea574e..fdd3902 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -14,7 +14,7 @@ FIREFOX_VER=12.0 MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.5.1 -NOSCRIPT_VER=2.3.9 +NOSCRIPT_VER=2.4.1 HTTPSEVERYWHERE_VER=2.0.2 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 4cc2c67..16ff624 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=11 +BUILD_NUM=12 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index ec5d245..db2edfa 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.35-12); suite=linux + + * Update OpenSSL to 1.0.1c + * Update Libevent to 2.0.19-stable + * Update zlib to 1.2.7 + * Update NoScript to 2.4.1 + + -- Erinn Clark <erinn(a)torproject.org> Fri May 11 20:16:14 BRT 2012 + Tor Browser Bundle (2.2.35-11); suite=linux * Security release to stop TorBrowser from bypassing SOCKS proxy DNS diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 4c00da6..f432023 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.35-12); suite=osx + + * Update OpenSSL to 1.0.1c + * Update Libevent to 2.0.19-stable + * Update zlib to 1.2.7 + * Update NoScript to 2.4.1 + + -- Erinn Clark <erinn(a)torproject.org> Fri May 11 20:16:04 BRT 2012 + Tor Browser Bundle (2.2.35-11); suite=osx * Security release to stop TorBrowser from bypassing SOCKS proxy DNS diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index ea5f86b..fe7680a 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.35-12); suite=windows + + * Update OpenSSL to 1.0.1c + * Update Libevent to 2.0.19-stable + * Update zlib to 1.2.7 + * Update NoScript to 2.4.1 + + -- Erinn Clark <erinn(a)torproject.org> Fri May 11 20:16:10 BRT 2012 + Tor Browser Bundle (2.2.35-11); suite=windows * Security release to stop TorBrowser from bypassing SOCKS proxy DNS

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 12 May '12

12 May '12

commit d849559d2527cd4e1f9608673f351c9e9ae0a4ee Merge: fe9c514 3dff6ac Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 11 20:09:48 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/windows.mk | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)

1 0

[torbrowser/maint-2.3] Reset write attribute that 'sed --in-place' forgets to set.
by erinn＠torproject.org 12 May '12

12 May '12

commit 3dff6acbfc16e8e33211bc0806982751008aabd8 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Sat May 5 13:54:38 2012 +0200 Reset write attribute that 'sed --in-place' forgets to set. --- build-scripts/windows.mk | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 9d769dd..4cc2c67 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -388,6 +388,8 @@ patch-firefox-language: ./patch-firefox-language.sh $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js $(LANGCODE) sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js + chmod u+w $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js + chmod u+w $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js ### ### Utilities

1 0

[torbrowser/maint-2.3] bump all tbbs to 2.2.35-12 for openssl 1.0.1c, libevent 2.0.19-stable
by erinn＠torproject.org 12 May '12

12 May '12

commit d3b0d1bca00c6edf0966e654aaddcb9f222c9415 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 11 21:01:43 2012 -0300 bump all tbbs to 2.2.35-12 for openssl 1.0.1c, libevent 2.0.19-stable --- README.LINUX-2.2 | 4 ++-- README.OSX-2.2 | 4 ++-- README.WIN-2.2 | 4 ++-- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 9 +++++++++ changelog.osx-2.2 | 9 +++++++++ changelog.windows-2.2 | 9 +++++++++ 10 files changed, 37 insertions(+), 10 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index f6b803a..f379cce 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,10 +5,10 @@ Included applications --------------------- Vidalia 0.2.17 (with Qt 4.8.1) -Tor 0.2.2.35 (with libevent-2.0.18-stable, zlib-1.2.6 and openssl-1.0.1b) +Tor 0.2.2.35 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 12.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.3.9 + |_ NoScript 2.4.1 |_ HTTPS-Everywhere 2.0.2 Usage diff --git a/README.OSX-2.2 b/README.OSX-2.2 index ccb11c1..ebe97b4 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,10 +5,10 @@ Included applications --------------------- Vidalia 0.2.17 (with Qt 4.8.1) -Tor 0.2.2.35 (with libevent-2.0.18-stable, zlib-1.2.6 and openssl-1.0.1b) +Tor 0.2.2.35 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 12.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.3.9 + |_ NoScript 2.4.1 |_ HTTPS-Everywhere 2.0.2 Usage diff --git a/README.WIN-2.2 b/README.WIN-2.2 index bb9c1b8..a3bac24 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,10 +5,10 @@ Included applications --------------------- Vidalia 0.2.17 (with Qt 4.8.1) -Tor 0.2.2.35 (with libevent-2.0.18-stable, zlib-1.2.6 and openssl-1.0.1b) +Tor 0.2.2.35 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 12.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.3.9 + |_ NoScript 2.4.1 |_ HTTPS-Everywhere 2.0.2 Usage diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 0584ec7..49d3d2e 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=11 +BUILD_NUM=12 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 2a4c704..bfc628d 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=11 +BUILD_NUM=12 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index eea574e..fdd3902 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -14,7 +14,7 @@ FIREFOX_VER=12.0 MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.5.1 -NOSCRIPT_VER=2.3.9 +NOSCRIPT_VER=2.4.1 HTTPSEVERYWHERE_VER=2.0.2 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 4cc2c67..16ff624 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=11 +BUILD_NUM=12 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index ec5d245..db2edfa 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.35-12); suite=linux + + * Update OpenSSL to 1.0.1c + * Update Libevent to 2.0.19-stable + * Update zlib to 1.2.7 + * Update NoScript to 2.4.1 + + -- Erinn Clark <erinn(a)torproject.org> Fri May 11 20:16:14 BRT 2012 + Tor Browser Bundle (2.2.35-11); suite=linux * Security release to stop TorBrowser from bypassing SOCKS proxy DNS diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 4c00da6..f432023 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.35-12); suite=osx + + * Update OpenSSL to 1.0.1c + * Update Libevent to 2.0.19-stable + * Update zlib to 1.2.7 + * Update NoScript to 2.4.1 + + -- Erinn Clark <erinn(a)torproject.org> Fri May 11 20:16:04 BRT 2012 + Tor Browser Bundle (2.2.35-11); suite=osx * Security release to stop TorBrowser from bypassing SOCKS proxy DNS diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index ea5f86b..fe7680a 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.35-12); suite=windows + + * Update OpenSSL to 1.0.1c + * Update Libevent to 2.0.19-stable + * Update zlib to 1.2.7 + * Update NoScript to 2.4.1 + + -- Erinn Clark <erinn(a)torproject.org> Fri May 11 20:16:10 BRT 2012 + Tor Browser Bundle (2.2.35-11); suite=windows * Security release to stop TorBrowser from bypassing SOCKS proxy DNS

1 0