November 2014 - tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Update changelog for meek fix.
by mikeperry＠torproject.org 04 Nov '14

04 Nov '14

commit 40721d5393f5247fd1075886244fa77558e35ef2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Nov 3 19:20:37 2014 -0800 Update changelog for meek fix. --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 4098fe7..376a38b 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -12,6 +12,7 @@ Tor Browser 4.5-alpha-1 -- Nov 3 2014 * Bug 13019: Synchronize locale spoofing pref with our Firefox patch * Bug 3455: Use SOCKS user+pass to isolate all requests from the same url domain * Bug 8641: Create browser UI to indicate current tab's Tor circuit IPs + * Bug 13586: Make meek use TLS session tickets (to look like stock Firefox). * Include obfs4proxy pluggable transport * Windows * Bug 13443: Re-enable DirectShow; fix crash with mingw patch.

1 0

[tor-browser-bundle/master] Bump to build3 for 64bit osx fixes.
by mikeperry＠torproject.org 03 Nov '14

03 Nov '14

commit 31349ad13349e11a7f9343c4fec0fafe4cd2b44c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Nov 3 00:03:41 2014 -0800 Bump to build3 for 64bit osx fixes. --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 27ee9da..b84f92e 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -8,7 +8,7 @@ FIREFOX_VERSION=31.2.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build3 TOR_TAG=tor-0.2.6.1-alpha TORLAUNCHER_TAG=0.2.7.0.1 TORBUTTON_TAG=1.8.0.0

1 0

[tor-browser/tor-browser-31.2.0esr-4.5-1] It seems like we need to add one more path traversal for ESR31
by mikeperry＠torproject.org 03 Nov '14

03 Nov '14

commit 892f8b664e82abe2afb9b488f5e095c7d4006629 Author: Tom Ritter <tom(a)ritter.vg> Date: Mon Oct 27 11:31:20 2014 -0500 It seems like we need to add one more path traversal for ESR31 --- toolkit/library/dependentlibs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/library/dependentlibs.py b/toolkit/library/dependentlibs.py index 4331cfa..4889a1e 100644 --- a/toolkit/library/dependentlibs.py +++ b/toolkit/library/dependentlibs.py @@ -71,7 +71,7 @@ def dependentlibs_readelf(lib): def dependentlibs_otool(lib): '''Returns the list of dependencies declared in the given MACH-O dylib''' - proc = subprocess.Popen(["../../../../x-tools/x86_64-apple-darwin10/bin/" + TOOLCHAIN_PREFIX + 'otool', '-l', lib], stdout = subprocess.PIPE) + proc = subprocess.Popen(["../../../../../x-tools/x86_64-apple-darwin10/bin/" + TOOLCHAIN_PREFIX + 'otool', '-l', lib], stdout = subprocess.PIPE) deps= [] cmd = None for line in proc.stdout:

1 0

[tor-browser/tor-browser-31.2.0esr-4.5-1] Changes needed to build Mac in 64bit
by mikeperry＠torproject.org 03 Nov '14

03 Nov '14

commit b8b6d86a5b6407b9e0f42bfe1de188e5be49b47d Author: Tom Ritter <tom(a)ritter.vg> Date: Tue Sep 16 08:10:50 2014 -0500 Changes needed to build Mac in 64bit --- .mozconfig-mac | 4 ++-- toolkit/library/dependentlibs.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.mozconfig-mac b/.mozconfig-mac index 4abcc7c..2c06c34 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -2,7 +2,7 @@ export CROSS_COMPILE=1 SYSROOTDIR=/usr/lib/apple/SDKs/MacOSX10.6.sdk ROOTDIR="$HOME/build/x-tools/x86_64-apple-darwin10/bin" -FLAGS="-arch i386 -isysroot $SYSROOTDIR" +FLAGS="-arch x86_64 -isysroot $SYSROOTDIR" # Ideally we use the patch provided in # https://bugzilla.mozilla.org/show_bug.cgi?id=933071 to get rid of our path @@ -26,7 +26,7 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 -ac_add_options --target=i386-apple-darwin10 +ac_add_options --target=x86_64-apple-darwin10 ac_add_options --enable-application=browser ac_add_options --enable-strip ac_add_options --enable-official-branding diff --git a/toolkit/library/dependentlibs.py b/toolkit/library/dependentlibs.py index 43433a1b..4331cfa 100644 --- a/toolkit/library/dependentlibs.py +++ b/toolkit/library/dependentlibs.py @@ -71,7 +71,7 @@ def dependentlibs_readelf(lib): def dependentlibs_otool(lib): '''Returns the list of dependencies declared in the given MACH-O dylib''' - proc = subprocess.Popen(['otool', '-l', lib], stdout = subprocess.PIPE) + proc = subprocess.Popen(["../../../../x-tools/x86_64-apple-darwin10/bin/" + TOOLCHAIN_PREFIX + 'otool', '-l', lib], stdout = subprocess.PIPE) deps= [] cmd = None for line in proc.stdout:

1 0

[tor-browser/tor-browser-31.2.0esr-4.5-1] Merge remote-tracking branch 'tjr/tor-browser-31.2.0esr-4.x-1-build1-64bit' into tor-browser-31.2.0esr-4.5-1
by mikeperry＠torproject.org 03 Nov '14

03 Nov '14

commit be0ac860051f1c3d61ee00a5d9140595981d3f2c Merge: e65a5a7 892f8b6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Nov 3 00:00:06 2014 -0800 Merge remote-tracking branch 'tjr/tor-browser-31.2.0esr-4.x-1-build1-64bit' into tor-browser-31.2.0esr-4.5-1 .mozconfig-mac | 4 ++-- toolkit/library/dependentlibs.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)

1 0