- tor-commits - lists.torproject.org

[torbrowser/master] bump alpha tbbs to 2.3.12-alpha-2
by erinn＠torproject.org 19 Mar '12

19 Mar '12

commit 84b1758c054203b59e6ed9f54a95aa5b3463a222 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Mar 19 01:28:44 2012 -0300 bump alpha tbbs to 2.3.12-alpha-2 --- README.LINUX-2.3 | 6 +++--- README.OSX-2.3 | 6 +++--- README.WIN-2.3 | 6 +++--- build-scripts/linux-alpha.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/versions-alpha.mk | 4 ++-- build-scripts/windows-alpha.mk | 2 +- changelog.linux-2.3 | 14 +++++++++++++- changelog.osx-2.3 | 11 +++++++++++ changelog.windows-2.3 | 13 ++++++++++++- 10 files changed, 50 insertions(+), 16 deletions(-) diff --git a/README.LINUX-2.3 b/README.LINUX-2.3 index 760e6c8..8362384 100644 --- a/README.LINUX-2.3 +++ b/README.LINUX-2.3 @@ -6,10 +6,10 @@ Included applications Vidalia 0.3.1-alpha (with Qt 4.7.4) Tor 0.2.3.12-alpha (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.1-beta1) -Firefox 10.0.1 +Firefox 11.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.3 - |_ HTTPS-Everywhere 2.0development.4 + |_ NoScript 2.3.4 + |_ HTTPS-Everywhere 3.0development.1 Usage ----- diff --git a/README.OSX-2.3 b/README.OSX-2.3 index 3f54336..aeef423 100644 --- a/README.OSX-2.3 +++ b/README.OSX-2.3 @@ -6,10 +6,10 @@ Included applications Vidalia 0.3.1-alpha (with Qt 4.7.4) Tor 0.2.3.12-alpha (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.1-beta1) -Firefox 10.0.1 +Firefox 11.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.3 - |_ HTTPS-Everywhere 2.0development.4 + |_ NoScript 2.3.4 + |_ HTTPS-Everywhere 3.0development.1 Usage ----- diff --git a/README.WIN-2.3 b/README.WIN-2.3 index 90c8c83..d5f1963 100644 --- a/README.WIN-2.3 +++ b/README.WIN-2.3 @@ -6,10 +6,10 @@ Included applications Vidalia 0.3.1-alpha (with Qt 4.7.4) Tor 0.2.3.12-alpha (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.1-beta1) -Firefox 10.0.1 +Firefox 11.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.3 - |_ HTTPS-Everywhere 2.0development.4 + |_ NoScript 2.3.4 + |_ HTTPS-Everywhere 3.0development.1 Usage ----- diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 04c1608..d78c977 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -36,7 +36,7 @@ include $(PWD)/versions-alpha.mk ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Linux ## Location of directory for source unpacking diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 678c531..8cf79e1 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -36,7 +36,7 @@ include $(PWD)/versions-alpha.mk ## Architecture ARCH_TYPE=i386 -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index a9397cf..dc9ac0f 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -2,11 +2,11 @@ RELEASE_VER=2.3.12-alpha -HTTPSEVERY_VER=2.0development.4 +HTTPSEVERY_VER=3.0development.1 FIREFOX_VER=11.0 LIBEVENT_VER=2.0.17-stable LIBPNG_VER=1.5.7 -NOSCRIPT_VER=2.3 +NOSCRIPT_VER=2.3.4 OPENSSL_VER=1.0.1-beta1 OTR_VER=3.2.0 PIDGIN_VER=2.6.4 diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index fb5f6d9..8155392 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions-alpha.mk -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index 8090ce7..62d8750 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -1,4 +1,16 @@ -Tor Browser Bundle (2.3.12-alpha-1); suite=osx +Tor Browser Bundle (2.3.12-alpha-2); suite=linux + + * Update Firefox to 11.0 + * Update NoScript to 2.3.4 + * Update HTTPS Everywhere to 3.0development.1 + * Disable HTTPS Everywhere SSL Observatory screen (closes: #5300) + * Always build to with warnings enabled (closes: #4470) + * Don't attempt to load the default KDE 4 theme from Vidalia, because that + fails when the Qt versions don't match (closes: #5214) + + -- Erinn Clark <erinn(a)torproject.org> Mon Mar 19 01:14:43 BRT 2012 + +Tor Browser Bundle (2.3.12-alpha-1); suite=linux * Initial release diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index 8090ce7..f88a5e2 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.3.12-alpha-2); suite=osx + + * Update Firefox to 11.0 + * Update NoScript to 2.3.4 + * Update HTTPS Everywhere to 3.0development.1 + * Disable HTTPS Everywhere SSL Observatory screen (closes: #5300) + * Always build to with warnings enabled (closes: #4470) + * Give OS X users below 10.5 an incompatibility message (closes: #4356) + + -- Erinn Clark <erinn(a)torproject.org> Mon Mar 19 01:14:43 BRT 2012 + Tor Browser Bundle (2.3.12-alpha-1); suite=osx * Initial release diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index 8090ce7..6ee3cfc 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -1,4 +1,15 @@ -Tor Browser Bundle (2.3.12-alpha-1); suite=osx +Tor Browser Bundle (2.3.12-alpha-2); suite=windows + + * Update Firefox to 11.0 + * Update NoScript to 2.3.4 + * Update HTTPS Everywhere to 3.0development.1 + * Disable HTTPS Everywhere SSL Observatory screen (closes: #5300) + * Always build to with warnings enabled (closes: #4470) + * Remove tor-resolve from the Windows bundle (closes: #5403) + + -- Erinn Clark <erinn(a)torproject.org> Mon Mar 19 01:14:43 BRT 2012 + +Tor Browser Bundle (2.3.12-alpha-1); suite=windows * Initial release

1 0

[torbrowser/maint-2.3] fix linux launch script so that it doesn't run in debug mode all the time (closes: #5417)
by erinn＠torproject.org 19 Mar '12

19 Mar '12

commit faea26d921d1bc197bb4f10f6a647abcc14f64d0 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Mar 19 01:08:50 2012 -0300 fix linux launch script so that it doesn't run in debug mode all the time (closes: #5417) --- src/RelativeLink/RelativeLink.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 053b471..35846b1 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -205,7 +205,7 @@ LDPATH="${HOME}/Lib/" export LDPATH export LD_LIBRARY_PATH -if [ "${debug}" ]; then +if [ "$debug" -eq 1 ]; then printf "\nStarting Vidalia now\n" cd "${HOME}" printf "\nLaunching Vidalia from: `pwd`\n"

1 0

[torbrowser/maint-2.2] update linux bundles to 2.2.35-9 to prevent tbb from running in debug mode
by erinn＠torproject.org 19 Mar '12

19 Mar '12

commit c94869dd8923cf10e375a4caaf85cc75394fffd9 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Mar 19 01:11:05 2012 -0300 update linux bundles to 2.2.35-9 to prevent tbb from running in debug mode --- build-scripts/linux.mk | 2 +- changelog.linux-2.2 | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 242f957..4235b1c 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=8 +BUILD_NUM=9 PLATFORM=Linux ## Build machine specific settings diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index e0fa3f1..9adf7aa 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.2.35-9); suite=linux + + * Fix launch script to prevent Vidalia from running in debug mode all the + time (closes: #5417) + + -- Erinn Clark <erinn(a)torproject.org> Mon Mar 19 01:10:06 BRT 2012 + Tor Browser Bundle (2.2.35-8); suite=linux * Update Firefox to 11.0

1 0

[torbrowser/maint-2.2] fix linux launch script so that it doesn't run in debug mode all the time (closes: #5417)
by erinn＠torproject.org 19 Mar '12

19 Mar '12

commit faea26d921d1bc197bb4f10f6a647abcc14f64d0 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Mar 19 01:08:50 2012 -0300 fix linux launch script so that it doesn't run in debug mode all the time (closes: #5417) --- src/RelativeLink/RelativeLink.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 053b471..35846b1 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -205,7 +205,7 @@ LDPATH="${HOME}/Lib/" export LDPATH export LD_LIBRARY_PATH -if [ "${debug}" ]; then +if [ "$debug" -eq 1 ]; then printf "\nStarting Vidalia now\n" cd "${HOME}" printf "\nLaunching Vidalia from: `pwd`\n"

1 0

[torbrowser/master] fix linux launch script so that it doesn't run in debug mode all the time (closes: #5417)
by erinn＠torproject.org 19 Mar '12

19 Mar '12

commit faea26d921d1bc197bb4f10f6a647abcc14f64d0 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Mar 19 01:08:50 2012 -0300 fix linux launch script so that it doesn't run in debug mode all the time (closes: #5417) --- src/RelativeLink/RelativeLink.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 053b471..35846b1 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -205,7 +205,7 @@ LDPATH="${HOME}/Lib/" export LDPATH export LD_LIBRARY_PATH -if [ "${debug}" ]; then +if [ "$debug" -eq 1 ]; then printf "\nStarting Vidalia now\n" cd "${HOME}" printf "\nLaunching Vidalia from: `pwd`\n"

1 0

[torbrowser/master] update linux bundles to 2.2.35-9 to prevent tbb from running in debug mode
by erinn＠torproject.org 19 Mar '12

19 Mar '12

commit c94869dd8923cf10e375a4caaf85cc75394fffd9 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Mar 19 01:11:05 2012 -0300 update linux bundles to 2.2.35-9 to prevent tbb from running in debug mode --- build-scripts/linux.mk | 2 +- changelog.linux-2.2 | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 242f957..4235b1c 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=8 +BUILD_NUM=9 PLATFORM=Linux ## Build machine specific settings diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index e0fa3f1..9adf7aa 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.2.35-9); suite=linux + + * Fix launch script to prevent Vidalia from running in debug mode all the + time (closes: #5417) + + -- Erinn Clark <erinn(a)torproject.org> Mon Mar 19 01:10:06 BRT 2012 + Tor Browser Bundle (2.2.35-8); suite=linux * Update Firefox to 11.0

1 0

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

19 Mar '12

commit 3f22b939ca27e1e9ac38563a79d20d2d403f4021 Merge: cb165cf c94869d Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Mar 19 01:11:43 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 2 +- changelog.linux-2.2 | 7 +++++++ src/RelativeLink/RelativeLink.sh | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0

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

19 Mar '12

commit 3f22b939ca27e1e9ac38563a79d20d2d403f4021 Merge: cb165cf c94869d Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Mar 19 01:11:43 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 2 +- changelog.linux-2.2 | 7 +++++++ src/RelativeLink/RelativeLink.sh | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0

[torbrowser/maint-2.3] update linux bundles to 2.2.35-9 to prevent tbb from running in debug mode
by erinn＠torproject.org 19 Mar '12

19 Mar '12

commit c94869dd8923cf10e375a4caaf85cc75394fffd9 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Mar 19 01:11:05 2012 -0300 update linux bundles to 2.2.35-9 to prevent tbb from running in debug mode --- build-scripts/linux.mk | 2 +- changelog.linux-2.2 | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 242f957..4235b1c 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=8 +BUILD_NUM=9 PLATFORM=Linux ## Build machine specific settings diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index e0fa3f1..9adf7aa 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.2.35-9); suite=linux + + * Fix launch script to prevent Vidalia from running in debug mode all the + time (closes: #5417) + + -- Erinn Clark <erinn(a)torproject.org> Mon Mar 19 01:10:06 BRT 2012 + Tor Browser Bundle (2.2.35-8); suite=linux * Update Firefox to 11.0

1 0

r25555: {website} update tbb osx 64-bit bundle to 2.2.35-8 too (website/trunk/include)
by Erinn Clark 19 Mar '12

19 Mar '12

Author: erinn Date: 2012-03-19 03:52:45 +0000 (Mon, 19 Mar 2012) New Revision: 25555 Modified: website/trunk/include/versions.wmi Log: update tbb osx 64-bit bundle to 2.2.35-8 too Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-03-18 22:47:14 UTC (rev 25554) +++ website/trunk/include/versions.wmi 2012-03-19 03:52:45 UTC (rev 25555) @@ -46,7 +46,7 @@ <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.17</define-tag> <define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.35-8</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-7.1</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-8</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>11.0</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag>

1 0