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

[torbrowser/maint-2.3] update osx changelog for 2.2.35-9.1 and add missing changelog entry about 10.5 compatibility to 2.2.35-9
by erinn＠torproject.org 28 Apr '12

28 Apr '12

commit a353d7df08ab399ed10821e5d5ef4e86afd30e55 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Apr 28 18:18:21 2012 -0300 update osx changelog for 2.2.35-9.1 and add missing changelog entry about 10.5 compatibility to 2.2.35-9 --- changelog.osx-2.2 | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 667e890..428307a 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.35-9.1); suite=osx + + * Fix paths in Vidalia so TorBrowser will launch on the 64-bit version + + -- Erinn Clark <erinn(a)torproject.org> Sat Apr 28 18:14:27 BRT 2012 + Tor Browser Bundle (2.2.35-9); suite=osx * Update Firefox to 12.0 @@ -14,6 +20,7 @@ Tor Browser Bundle (2.2.35-9); suite=osx - Add Steven Michaud's OS X crash fix patch. It doesn't fix #5021 but will hopefully help us debug further. See also: https://bugzilla.mozilla.org/show_bug.cgi?id=715885#c35 + * Make the 32-bit Tor Browser Bundle compatible with OS X 10.5 -- Erinn Clark <erinn(a)torproject.org> Fri Apr 27 12:43:23 BRT 2012

1 0

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

28 Apr '12

commit 75b70e97299d6997a7bbf47f38fbe77a32bba197 Merge: 015742f a353d7d Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Apr 28 18:18:54 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/osx.mk | 4 ++-- build-scripts/versions.mk | 2 +- changelog.osx-2.2 | 7 +++++++ 3 files changed, 10 insertions(+), 3 deletions(-)

1 0

[torbrowser/master] bump osx tbb to 9.1 for x86_64
by erinn＠torproject.org 28 Apr '12

28 Apr '12

commit 81c57ca46abea01e8209fd51f67c0c1090795293 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Apr 28 18:13:54 2012 -0300 bump osx tbb to 9.1 for x86_64 --- build-scripts/osx.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index bbefe9a..9faadad 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -14,8 +14,8 @@ ## Architecture -ARCH_TYPE=i386 -BUILD_NUM=9 +ARCH_TYPE=x86_64 +BUILD_NUM=9.1 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options

1 0

[torbrowser/master] update osx changelog for 2.2.35-9.1 and add missing changelog entry about 10.5 compatibility to 2.2.35-9
by erinn＠torproject.org 28 Apr '12

28 Apr '12

commit a353d7df08ab399ed10821e5d5ef4e86afd30e55 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Apr 28 18:18:21 2012 -0300 update osx changelog for 2.2.35-9.1 and add missing changelog entry about 10.5 compatibility to 2.2.35-9 --- changelog.osx-2.2 | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 667e890..428307a 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.35-9.1); suite=osx + + * Fix paths in Vidalia so TorBrowser will launch on the 64-bit version + + -- Erinn Clark <erinn(a)torproject.org> Sat Apr 28 18:14:27 BRT 2012 + Tor Browser Bundle (2.2.35-9); suite=osx * Update Firefox to 12.0 @@ -14,6 +20,7 @@ Tor Browser Bundle (2.2.35-9); suite=osx - Add Steven Michaud's OS X crash fix patch. It doesn't fix #5021 but will hopefully help us debug further. See also: https://bugzilla.mozilla.org/show_bug.cgi?id=715885#c35 + * Make the 32-bit Tor Browser Bundle compatible with OS X 10.5 -- Erinn Clark <erinn(a)torproject.org> Fri Apr 27 12:43:23 BRT 2012

1 0

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

28 Apr '12

commit 75b70e97299d6997a7bbf47f38fbe77a32bba197 Merge: 015742f a353d7d Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Apr 28 18:18:54 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/osx.mk | 4 ++-- build-scripts/versions.mk | 2 +- changelog.osx-2.2 | 7 +++++++ 3 files changed, 10 insertions(+), 3 deletions(-)

1 0

[torbrowser/maint-2.2] Make sure vidalia gets re-extracted when a patch changed
by erinn＠torproject.org 28 Apr '12

28 Apr '12

commit c909d6c1a5e37885dce44f76fa11c5144974a149 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Apr 28 22:56:30 2012 +0200 Make sure vidalia gets re-extracted when a patch changed This caused an issue with a TBB release, when an older Vidalia was accidentally included. --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index aeebee7..f783ee0 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -184,7 +184,7 @@ $(OPENSSL_DIR): $(FETCH_DIR)/$(OPENSSL_PACKAGE) ../src/current-patches/openssl/* cp patch-any-src.sh $(OPENSSL_DIR) cd $(OPENSSL_DIR) && ./patch-any-src.sh -$(VIDALIA_DIR): $(FETCH_DIR)/$(VIDALIA_PACKAGE) | $(BUILD_DIR) +$(VIDALIA_DIR): $(FETCH_DIR)/$(VIDALIA_PACKAGE) ../src/current-patches/vidalia/*patch | $(BUILD_DIR) rm -rf $(VIDALIA_DIR) cd $(FETCH_DIR) && tar -xmf $(VIDALIA_PACKAGE) -C $(BUILD_DIR)/ ifeq (MacOS,$(PLATFORM))

1 0

[torbrowser/maint-2.2] bump osx tbb to 9.1 for x86_64
by erinn＠torproject.org 28 Apr '12

28 Apr '12

commit 81c57ca46abea01e8209fd51f67c0c1090795293 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Apr 28 18:13:54 2012 -0300 bump osx tbb to 9.1 for x86_64 --- build-scripts/osx.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index bbefe9a..9faadad 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -14,8 +14,8 @@ ## Architecture -ARCH_TYPE=i386 -BUILD_NUM=9 +ARCH_TYPE=x86_64 +BUILD_NUM=9.1 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options

1 0

[torbrowser/maint-2.2] bump recommended-versions for firefox 12 bundles
by erinn＠torproject.org 28 Apr '12

28 Apr '12

commit 4c8d56879d09ea6bbc60ca6215f9529692a284b4 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Apr 28 10:51:20 2012 -0300 bump recommended-versions for firefox 12 bundles --- build-scripts/recommended-versions | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index a55f798..503794f 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,11 +1,11 @@ [ -"2.2.35-8-MacOS-i386", -"2.2.35-8-MacOS-x86_64", -"2.2.35-8-Windows", -"2.2.35-9-Linux-i686", -"2.2.35-9-Linux-x86_64", -"2.3.12-alpha-1-MacOS-i386", -"2.3.12-alpha-1-Windows", -"2.3.12-alpha-1-Linux-i386", -"2.3.12-alpha-1-Linux-x86_64" +"2.2.35-9-MacOS-i386", +"2.2.35-9-MacOS-x86_64", +"2.2.35-9-Windows", +"2.2.35-10-Linux-i686", +"2.2.35-10-Linux-x86_64", +"2.3.12-alpha-2-MacOS-i386", +"2.3.12-alpha-2-Windows", +"2.3.12-alpha-2-Linux-i386", +"2.3.12-alpha-2-Linux-x86_64" ]

1 0

[torbrowser/maint-2.3] bump recommended-versions for firefox 12 bundles
by erinn＠torproject.org 28 Apr '12

28 Apr '12

commit 4c8d56879d09ea6bbc60ca6215f9529692a284b4 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Apr 28 10:51:20 2012 -0300 bump recommended-versions for firefox 12 bundles --- build-scripts/recommended-versions | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index a55f798..503794f 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,11 +1,11 @@ [ -"2.2.35-8-MacOS-i386", -"2.2.35-8-MacOS-x86_64", -"2.2.35-8-Windows", -"2.2.35-9-Linux-i686", -"2.2.35-9-Linux-x86_64", -"2.3.12-alpha-1-MacOS-i386", -"2.3.12-alpha-1-Windows", -"2.3.12-alpha-1-Linux-i386", -"2.3.12-alpha-1-Linux-x86_64" +"2.2.35-9-MacOS-i386", +"2.2.35-9-MacOS-x86_64", +"2.2.35-9-Windows", +"2.2.35-10-Linux-i686", +"2.2.35-10-Linux-x86_64", +"2.3.12-alpha-2-MacOS-i386", +"2.3.12-alpha-2-Windows", +"2.3.12-alpha-2-Linux-i386", +"2.3.12-alpha-2-Linux-x86_64" ]

1 0

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

28 Apr '12

commit 015742f6fd8fa0144be748adbfbc532591a4dfdc Merge: 0c4d7fc 4c8d568 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Apr 28 10:51:36 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)

1 0