- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] update_responses: accept '-' in version numbers
by mikeperry＠torproject.org 24 Oct '14

24 Oct '14

commit 9e26ef8acfaefd7d7a84338e1bdb75efc0087de8 Author: Nicolas Vigier <boklm(a)mars-attacks.org> Date: Thu Oct 2 14:13:55 2014 +0200 update_responses: accept '-' in version numbers Version numbers like '4.0-alpha-2' contain '-'. --- tools/update-responses/update_responses | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index e94c15f..e86979b 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -60,7 +60,7 @@ sub get_version_files { }; next; } - if ($file =~ m/^tor-browser-([^-]+)-([^-]+)-${version}_(.+)\.mar$/) { + if ($file =~ m/^tor-browser-([^-]+)-(.+)-${version}_(.+)\.mar$/) { my ($os, $from_version, $lang) = ($1, $2, $3); $files->{$os}{$lang}{partial}{$from_version} = { type => 'partial',

1 0

[tor-browser-bundle/master] update_responses: write things in sorted order
by mikeperry＠torproject.org 24 Oct '14

24 Oct '14

commit 3cfcdc6a9b8261186063932277fffe112ff98ff1 Author: Nicolas Vigier <boklm(a)mars-attacks.org> Date: Sat Sep 27 14:37:11 2014 +0200 update_responses: write things in sorted order So that the same input files always produce the same output files. --- tools/update-responses/update_responses | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index e082592..6e9365a 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -106,7 +106,8 @@ sub get_response { defined $minversion ? ( minSupportedOSVersion => $minversion ) : (), ); foreach my $patch (@patches) { - $writer->startTag('patch', %$patch); + my @sorted_patch = map { $_ => $patch->{$_} } sort keys %$patch; + $writer->startTag('patch', @sorted_patch); $writer->endTag('patch'); } CLOSETAGS: @@ -141,16 +142,16 @@ sub write_htaccess { my ($config) = @_; my $htaccess = "RewriteEngine On\n"; my $flags = "[last]"; - foreach my $channel (keys %{$config->{channels}}) { + foreach my $channel (sort keys %{$config->{channels}}) { my $version = $config->{channels}{$channel}; my $files = $config->{versions}{$version}{files}; $htaccess .= "RewriteRule " . "^$channel/[^\/]+/$version/ " . "no-update.xml $flags\n"; - foreach my $os (keys %$files) { + foreach my $os (sort keys %$files) { my $bt = build_target_by_os($os); - foreach my $lang (keys %{$files->{$os}}) { - foreach my $from_version (keys %{$files->{$os}{$lang}{partial}}) { + foreach my $lang (sort keys %{$files->{$os}}) { + foreach my $from_version (sort keys %{$files->{$os}{$lang}{partial}}) { $htaccess .= "RewriteRule ^$channel/$bt/$from_version/$lang " . "$from_version-$version-$os-$lang.xml $flags\n"; }

1 0

[tor-browser-bundle/master] update_responses: use MAR files in gitian/$version
by mikeperry＠torproject.org 24 Oct '14

24 Oct '14

commit 3a87320ea29455b58ee4978f58f3c24f7113b8e6 Author: Nicolas Vigier <boklm(a)mars-attacks.org> Date: Sat Sep 27 15:23:42 2014 +0200 update_responses: use MAR files in gitian/$version Look for MAR files where the gitian build put them instead of a releases subdir. --- tools/update-responses/update_responses | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/releases/.directory b/tools/update-responses/releases/.directory deleted file mode 100644 index e69de29..0000000 diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 6e9365a..e94c15f 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -45,7 +45,7 @@ sub get_version_files { my ($config, $version) = @_; return if $config->{versions}{$version}{files}; my $files = {}; - my $vdir = "$FindBin::Bin/releases/$version"; + my $vdir = "$FindBin::Bin/../../gitian/$version"; opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { next unless -f "$vdir/$file";

1 0

[tor-browser/tor-browser-31.2.0esr-4.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 24 Oct '14

24 Oct '14

commit 3dd8fa462d0813913e99c0ab3678bd839fece7d2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 24 16:20:07 2014 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bug #13443: Prevent crashing on windows by disabling DirectShow. --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 83b79b2..d8498b2 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -172,6 +172,9 @@ pref("security.tls.version.max", 3); // POODLE hotfix: Disable SSLv3 pref("security.tls.version.min", 1); +// Bug 13443: Disable DirectShow to prevent crashing on windows +pref("media.directshow.enabled", false); + #ifdef TOR_BROWSER_VERSION #expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); #endif

1 0

[tor-browser/tor-browser-31.2.0esr-4.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 24 Oct '14

24 Oct '14

commit 187dd1ff67068abde5d36f61aca1305c76daded8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 24 16:18:40 2014 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 13416: Defend against new SSLv3 attack (poodle). --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index e0eb834..83b79b2 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -169,6 +169,8 @@ pref("media.audio_data.enabled", false); // Enable TLS 1.1 and 1.2: // https://trac.torproject.org/projects/tor/ticket/11253 pref("security.tls.version.max", 3); +// POODLE hotfix: Disable SSLv3 +pref("security.tls.version.min", 1); #ifdef TOR_BROWSER_VERSION #expand pref("torbrowser.version", __TOR_BROWSER_VERSION__);

1 0

[tor-browser/tor-browser-31.2.0esr-4.x-1] Bug 13301: Avoid incompatible extensions prompt.
by mikeperry＠torproject.org 24 Oct '14

24 Oct '14

commit bc7f0127a2832ea6c9d7e72269404d9034793a92 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Oct 14 15:10:49 2014 -0400 Bug 13301: Avoid incompatible extensions prompt. When updating via the background / timer-based check, the updater reported to the user that some extensions were incompatible (not true). The fix is to check extension compatibility against the platformVersion in a few more places (instead of against the appVersion, which is something like "4.0-alpha-3"). --- toolkit/mozapps/update/content/updates.js | 35 +++++++++++++++++++++++++---- toolkit/mozapps/update/jar.mn | 2 +- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/toolkit/mozapps/update/content/updates.js b/toolkit/mozapps/update/content/updates.js index 7cebf0f..00cf228 100644 --- a/toolkit/mozapps/update/content/updates.js +++ b/toolkit/mozapps/update/content/updates.js @@ -1,3 +1,5 @@ +#filter substitution + /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -49,6 +51,11 @@ const CERT_ATTR_CHECK_FAILED_NO_UPDATE = 100; const CERT_ATTR_CHECK_FAILED_HAS_UPDATE = 101; const BACKGROUNDCHECK_MULTIPLE_FAILURES = 110; +#ifdef TOR_BROWSER_VERSION +# Add double-quotes back on (stripped by JarMaker.py). +#expand const TOR_BROWSER_VERSION = "__TOR_BROWSER_VERSION__"; +#endif + var gLogEnabled = false; var gUpdatesFoundPageId; @@ -531,8 +538,13 @@ var gUpdates = { return; } +#ifdef TOR_BROWSER_UPDATE + var appVersion = TOR_BROWSER_VERSION; +#else + var appVersion = Services.appinfo.version; +#endif if (!this.update.appVersion || - Services.vc.compare(this.update.appVersion, Services.appinfo.version) == 0) { + Services.vc.compare(this.update.appVersion, appVersion) == 0) { aCallback(false); return; } @@ -544,6 +556,11 @@ var gUpdates = { var self = this; AddonManager.getAllAddons(function(addons) { +#ifdef TOR_BROWSER_UPDATE + let compatVersion = self.update.platformVersion; +#else + let compatVersion = self.update.appVersion; +#endif self.addons = []; addons.forEach(function(addon) { // Protect against code that overrides the add-ons manager and doesn't @@ -572,7 +589,7 @@ var gUpdates = { !addon.appDisabled && !addon.userDisabled && addon.scope != AddonManager.SCOPE_APPLICATION && addon.isCompatible && - !addon.isCompatibleWith(self.update.appVersion, + !addon.isCompatibleWith(compatVersion, self.update.platformVersion)) self.addons.push(addon); } @@ -842,9 +859,14 @@ var gIncompatibleCheckPage = { this._totalCount = gUpdates.addons.length; this._pBar.mode = "normal"; +#ifdef TOR_BROWSER_UPDATE + let compatVersion = gUpdates.update.platformVersion; +#else + let compatVersion = gUpdates.update.appVersion; +#endif gUpdates.addons.forEach(function(addon) { addon.findUpdates(this, AddonManager.UPDATE_WHEN_NEW_APP_DETECTED, - gUpdates.update.appVersion, + compatVersion, gUpdates.update.platformVersion); }, this); }, @@ -869,8 +891,13 @@ var gIncompatibleCheckPage = { // the add-on will become incompatible. let bs = CoC["@mozilla.org/extensions/blocklist;1"]. getService(CoI.nsIBlocklistService); +#ifdef TOR_BROWSER_UPDATE + let compatVersion = gUpdates.update.platformVersion; +#else + let compatVersion = gUpdates.update.appVersion; +#endif if (bs.isAddonBlocklisted(addon, - gUpdates.update.appVersion, + compatVersion, gUpdates.update.platformVersion)) return; diff --git a/toolkit/mozapps/update/jar.mn b/toolkit/mozapps/update/jar.mn index 9bb5d2d..5347123 100644 --- a/toolkit/mozapps/update/jar.mn +++ b/toolkit/mozapps/update/jar.mn @@ -7,6 +7,6 @@ toolkit.jar: content/mozapps/update/history.xul (content/history.xul) content/mozapps/update/history.js (content/history.js) content/mozapps/update/updates.css (content/updates.css) - content/mozapps/update/updates.js (content/updates.js) +* content/mozapps/update/updates.js (content/updates.js) content/mozapps/update/updates.xml (content/updates.xml) content/mozapps/update/updates.xul (content/updates.xul)

1 0

[tor-browser/tor-browser-31.2.0esr-4.x-1] Merge remote-tracking branch 'brade/bug13301' into tor-browser-31.2.0esr-4.x-1
by mikeperry＠torproject.org 24 Oct '14

24 Oct '14

commit 1c33659d907bcfdb9f6f06383942b1f57c3abcfe Merge: 6cb68a4 bc7f012 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 23 18:19:53 2014 -0700 Merge remote-tracking branch 'brade/bug13301' into tor-browser-31.2.0esr-4.x-1 toolkit/mozapps/update/content/updates.js | 35 +++++++++++++++++++++++++---- toolkit/mozapps/update/jar.mn | 2 +- 2 files changed, 32 insertions(+), 5 deletions(-)

1 0

[tor-browser/tor-browser-31.2.0esr-4.x-1] fixup! Bug 13028: Prevent potential proxy bypass cases.
by mikeperry＠torproject.org 24 Oct '14

24 Oct '14

commit 6cb68a4ec0990509273a939c2034c20aa26ff69d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 23 17:45:47 2014 -0700 fixup! Bug 13028: Prevent potential proxy bypass cases. This fixes MSVC compilation. --- security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c index 5bb6dd3..68ba2f4 100644 --- a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c +++ b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c @@ -1433,15 +1433,15 @@ pkix_pl_Socket_CreateByName( PKIX_ENTER(SOCKET, "pkix_pl_Socket_CreateByName"); PKIX_NULLCHECK_TWO(serverName, pSocket); + localCopyName = PL_strdup(serverName); + // XXX: Do we need a unittest ifdef here? We don't want to break the tests, but // we want to ensure nothing can ever hit this code in production. #if 1 printf("Tor Browser BUG: Attempted pkix direct connect to %s\n", serverName); - return PR_FAILURE; + PKIX_ERROR(PKIX_PRNEWTCPSOCKETFAILED); #endif - localCopyName = PL_strdup(serverName); - sepPtr = strchr(localCopyName, ':'); /* First strip off the portnum, if present, from the end of the name */ if (sepPtr) { @@ -1596,7 +1596,7 @@ pkix_pl_Socket_CreateByHostAndPort( #if 1 printf("Tor Browser BUG: Attempted pkix direct connect to %s, port %u\n", hostname, portnum); - return PR_FAILURE; + PKIX_ERROR(PKIX_PRNEWTCPSOCKETFAILED); #endif prstatus = PR_GetHostByName(hostname, buf, sizeof(buf), &hostent);

1 0

[tor-browser-bundle/master] Bump alpha channel to 4.0.
by mikeperry＠torproject.org 16 Oct '14

16 Oct '14

commit 19e9fa863dd3169716cbd37df5e803b2d9d5aec7 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 15 21:16:57 2014 -0700 Bump alpha channel to 4.0. --- tools/update-responses/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 15843b6..b49ce1a 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -6,7 +6,7 @@ build_targets: osx32: Darwin_x86-gcc3 channels: release: 4.0 - alpha: 4.0-alpha-3 + alpha: 4.0 versions: 4.0: platformVersion: 31.2.0

1 0

[tor-browser-bundle/master] Bump NoScript version update changelog.
by gk＠torproject.org 15 Oct '14

15 Oct '14

commit a1c880c6cad43aac12f2ba49720a1185ae129000 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 15 08:57:24 2014 +0000 Bump NoScript version update changelog. --- Bundle-Data/Docs/ChangeLog.txt | 6 ++++-- gitian/versions | 4 ++-- gitian/versions.nightly | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 40fc9f1..7d8470b 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 4.0 -- Oct 14 2014 +Tor Browser 4.0 -- Oct 15 2014 * All Platforms * Update Firefox to 31.2.0esr * Update Torbutton to 1.7.0.1 @@ -11,7 +11,8 @@ Tor Browser 4.0 -- Oct 14 2014 * Update Tor Launcher to 0.2.7.0.1 * Translation updates only * Udate fteproxy to 0.2.19 - * Update NoScript to 2.6.9 + * Update NoScript to 2.6.9.1 + * Bug 13416: Defend against new SSLv3 attack (poodle). * Bug 13027: Spoof window.navigator useragent values in JS WebWorker threads * Bug 13016: Hide CSS -moz-osx-font-smoothing values. * Bug 13356: Meek and other symlinks missing after complete update. @@ -25,6 +26,7 @@ Tor Browser 4.0 -- Oct 14 2014 * Bug 13186: Disable DOM Performance timers * Bug 13028: Defense-in-depth checks for OCSP/Cert validation proxy usage + Tor Browser 4.0-alpha-3 -- Sep 24 2014 * All Platforms * Update Tor to 0.2.5.8-rc diff --git a/gitian/versions b/gitian/versions index f0ae4d9..a24f492 100755 --- a/gitian/versions +++ b/gitian/versions @@ -53,7 +53,7 @@ GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9-fx+sm+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.1-fn+fx+sm.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -81,7 +81,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=7012268e33bbc13d27c9fe8836d53d50b0ce30cad15ab4de5f9b3c3d96b478b8 +NOSCRIPT_HASH=92bfa1f8a5673ffc82fe54db43c5f410c1cf403e38b82780f01eeeeae8233d0b HTTPSE_HASH=cd811b1d424ff24939249de1e2b745ba86cbd7e6804699a9460c631a0b3474fe MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 9dc6f3f..4ff8d99 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -54,7 +54,7 @@ GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9-fx+sm+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.1-fn+fx+sm.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -82,7 +82,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=7012268e33bbc13d27c9fe8836d53d50b0ce30cad15ab4de5f9b3c3d96b478b8 +NOSCRIPT_HASH=92bfa1f8a5673ffc82fe54db43c5f410c1cf403e38b82780f01eeeeae8233d0b HTTPSE_HASH=6feb4982d13f89656b61435b6b49e1996c61bc79e52d046d02312879376028e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] The poodle hotfix.
by gk＠torproject.org 15 Oct '14

15 Oct '14

commit fd7e8eef09b813c445e31239bcb674de7a03d191 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 15 08:41:38 2014 +0000 The poodle hotfix. See: https://www.imperialviolet.org/2014/10/14/poodle.html for further information. --- gitian/descriptors/linux/gitian-bundle.yml | 4 ++++ gitian/descriptors/mac/gitian-bundle.yml | 4 ++++ gitian/descriptors/windows/gitian-bundle.yml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 19233b6..3de0d49 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -146,6 +146,8 @@ script: | cp defaults/preferences/000-tor-browser.js ~/build/ # Set the locale of the bundle. echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js + # The poodle hotfix + echo "pref(\"security.tls.version.min\", 1);" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults popd @@ -176,6 +178,8 @@ script: | cp ~/build/000-tor-browser.js defaults/preferences/ # Set the locale of the bundle. echo "pref(\"general.useragent.locale\", \"$LANG\");" >> defaults/preferences/000-tor-browser.js + # The poodle hotfix + echo "pref(\"security.tls.version.min\", 1);" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults popd diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 82b6595..9e78429 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -166,6 +166,8 @@ script: | cp defaults/preferences/000-tor-browser.js ~/build/ # Set the locale of the bundle. echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js + # The poodle hotfix + echo "pref(\"security.tls.version.min\", 1);" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults popd @@ -221,6 +223,8 @@ script: | cp ~/build/000-tor-browser.js defaults/preferences/ # Set the locale of the bundle. echo "pref(\"general.useragent.locale\", \"$LANG\");" >> defaults/preferences/000-tor-browser.js + # The poodle hotfix + echo "pref(\"security.tls.version.min\", 1);" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults popd diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 76f5c67..a3c4b8a 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -126,6 +126,8 @@ script: | cp defaults/preferences/000-tor-browser.js ~/build/ # Set the locale bundle. echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js + # The poodle hotfix + echo "pref(\"security.tls.version.min\", 1);" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults popd @@ -156,6 +158,8 @@ script: | mkdir -p defaults/preferences cp ~/build/000-tor-browser.js defaults/preferences/ echo "pref(\"general.useragent.locale\", \"$LANG\");" >> defaults/preferences/000-tor-browser.js + # The poodle hotfix + echo "pref(\"security.tls.version.min\", 1);" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults popd

1 0

[tor-browser-bundle/master] Add stable release channel to updater config.
by mikeperry＠torproject.org 13 Oct '14

13 Oct '14

commit 9e94ab8ddf44d51e5c30250f4308159114ad0c53 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Oct 13 12:27:57 2014 -0700 Add stable release channel to updater config. --- tools/update-responses/config.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 8b5475a..15843b6 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -5,8 +5,13 @@ build_targets: win32: WINNT_x86-gcc3 osx32: Darwin_x86-gcc3 channels: + release: 4.0 alpha: 4.0-alpha-3 versions: + 4.0: + platformVersion: 31.2.0 + detailsURL: https://www.torproject.org/projects/torbrowser.html.en + download_url: https://www.torproject.org/dist/torbrowser/4.0 4.0-alpha-3: platformVersion: 24.8.1 detailsURL: https://www.torproject.org/projects/torbrowser.html.en

1 0

[tor-browser-bundle/master] And having the wrong one, too.
by gk＠torproject.org 13 Oct '14

13 Oct '14

commit 3fd335159e507deb70024ef72e1063fdf4541326 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 13 15:12:38 2014 +0000 And having the wrong one, too. --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 65e37ee..9dc6f3f 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -95,7 +95,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff -GCC_HASH=6a8e4f11b185f4fe2ed9d7fc053e80f8c7e73f800c045f51f9d8bea33f080f1e +GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}

1 0

[tor-browser-bundle/master] Not having a GCC hash breaks nightlies.
by gk＠torproject.org 13 Oct '14

13 Oct '14

commit cf8a98200d8242ecfd8cdde7bc794556a144ea5b Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 13 14:54:51 2014 +0000 Not having a GCC hash breaks nightlies. --- gitian/versions.nightly | 1 + 1 file changed, 1 insertion(+) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 5541ded..65e37ee 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -95,6 +95,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff +GCC_HASH=6a8e4f11b185f4fe2ed9d7fc053e80f8c7e73f800c045f51f9d8bea33f080f1e ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}

1 0

[tor-browser-bundle/master] Adding faketime to verify-tags.sh.
by gk＠torproject.org 13 Oct '14

13 Oct '14

commit 7f607feb2d0475fccaceb2902df7d9948f0a688c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 13 11:38:36 2014 +0000 Adding faketime to verify-tags.sh. --- gitian/verify-tags.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 5cd8649..b7a89f1 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -112,6 +112,7 @@ libdmg-hfsplus $LIBDMG_TAG libfte $LIBFTE_TAG fteproxy $FTEPROXY_TAG txsocksx $TXSOCKSX_TAG +faketime $FAKETIME_TAG EOF # Verify signatures on signed packages

1 0

[tor-browser-bundle/master] Add changelog for 4.0-stable.
by mikeperry＠torproject.org 13 Oct '14

13 Oct '14

commit 1a98e3efb368fb9ff6b2d72d2ccf6d954462077f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Oct 12 18:02:25 2014 -0700 Add changelog for 4.0-stable. --- Bundle-Data/Docs/ChangeLog.txt | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 82e8138..40fc9f1 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,30 @@ +Tor Browser 4.0 -- Oct 14 2014 + * All Platforms + * Update Firefox to 31.2.0esr + * Update Torbutton to 1.7.0.1 + * Bug 13378: Prevent addon reordering in toolbars on first-run. + * Bug 10751: Adapt Torbutton to ESR31's Australis UI. + * Bug 13138: ESR31-about:tor shows "Tor is not working" + * Bug 12947: Adapt session storage blocker to ESR 31. + * Bug 10716: Take care of drag/drop events in ESR 31. + * Bug 13366: Fix cert exemption dialog when disk storage is enabled. + * Update Tor Launcher to 0.2.7.0.1 + * Translation updates only + * Udate fteproxy to 0.2.19 + * Update NoScript to 2.6.9 + * Bug 13027: Spoof window.navigator useragent values in JS WebWorker threads + * Bug 13016: Hide CSS -moz-osx-font-smoothing values. + * Bug 13356: Meek and other symlinks missing after complete update. + * Bug 13025: Spoof screen orientation to landscape-primary. + * Bug 13346: Disable Firefox "slow to start" warnings and recordkeeping. + * Bug 13318: Minimize number of buttons on the browser toolbar. + * Bug 10715: Enable WebGL on Windows (still click-to-play via NoScript) + * Bug 13023: Disable the gamepad API. + * Bug 13021: Prompt before allowing Canvas isPointIn*() calls. + * Bug 12460: Several cross-compilation and gitian fixes (see child tickets) + * Bug 13186: Disable DOM Performance timers + * Bug 13028: Defense-in-depth checks for OCSP/Cert validation proxy usage + Tor Browser 4.0-alpha-3 -- Sep 24 2014 * All Platforms * Update Tor to 0.2.5.8-rc

1 0

[tor-browser-bundle/master] Use HTTPS-E 4.0.1 for 4.0-stable.
by mikeperry＠torproject.org 13 Oct '14

13 Oct '14

commit 5786b7bc9d96144a3fb81d51a5ae4a4e8934bc76 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Oct 12 17:31:19 2014 -0700 Use HTTPS-E 4.0.1 for 4.0-stable. --- gitian/versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions b/gitian/versions index edc06a1..f0ae4d9 100755 --- a/gitian/versions +++ b/gitian/versions @@ -47,7 +47,7 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=5.0development.0 +HTTPSE_VER=4.0.1 GO_VER=1.3.3 ## File names for the source packages @@ -82,7 +82,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=7012268e33bbc13d27c9fe8836d53d50b0ce30cad15ab4de5f9b3c3d96b478b8 -HTTPSE_HASH=6feb4982d13f89656b61435b6b49e1996c61bc79e52d046d02312879376028e3 +HTTPSE_HASH=cd811b1d424ff24939249de1e2b745ba86cbd7e6804699a9460c631a0b3474fe MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Fix noscript hash.
by mikeperry＠torproject.org 11 Oct '14

11 Oct '14

commit 4eccc80cbd7dd7d09f2d78c20a7feacc656f27db Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Oct 11 01:49:05 2014 -0700 Fix noscript hash. --- gitian/versions | 2 +- gitian/versions.nightly | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions b/gitian/versions index 124f9c7..edc06a1 100755 --- a/gitian/versions +++ b/gitian/versions @@ -81,7 +81,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=6b97c02b3ceab452f0ceec0f8918e0653837b24f376ba1a9dd78bb551bae3715 +NOSCRIPT_HASH=7012268e33bbc13d27c9fe8836d53d50b0ce30cad15ab4de5f9b3c3d96b478b8 HTTPSE_HASH=6feb4982d13f89656b61435b6b49e1996c61bc79e52d046d02312879376028e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 592d17e..5541ded 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -82,7 +82,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=6b97c02b3ceab452f0ceec0f8918e0653837b24f376ba1a9dd78bb551bae3715 +NOSCRIPT_HASH=7012268e33bbc13d27c9fe8836d53d50b0ce30cad15ab4de5f9b3c3d96b478b8 HTTPSE_HASH=6feb4982d13f89656b61435b6b49e1996c61bc79e52d046d02312879376028e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Bump NoScript to 2.6.9.
by mikeperry＠torproject.org 11 Oct '14

11 Oct '14

commit 189f0aff0079e24a2b54dc3223635aeb4f9bed1d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Oct 11 01:42:26 2014 -0700 Bump NoScript to 2.6.9. --- gitian/versions | 4 ++-- gitian/versions.nightly | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index 440858e..124f9c7 100755 --- a/gitian/versions +++ b/gitian/versions @@ -53,7 +53,7 @@ GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.42-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9-fx+sm+fn.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -81,7 +81,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=b474156fd6b9957b38054a34c8acb581204f08733cce898ed581c67d425dda33 +NOSCRIPT_HASH=6b97c02b3ceab452f0ceec0f8918e0653837b24f376ba1a9dd78bb551bae3715 HTTPSE_HASH=6feb4982d13f89656b61435b6b49e1996c61bc79e52d046d02312879376028e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.nightly b/gitian/versions.nightly index e3a1d65..592d17e 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -54,7 +54,7 @@ GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.42-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9-fx+sm+fn.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -82,7 +82,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=b474156fd6b9957b38054a34c8acb581204f08733cce898ed581c67d425dda33 +NOSCRIPT_HASH=6b97c02b3ceab452f0ceec0f8918e0653837b24f376ba1a9dd78bb551bae3715 HTTPSE_HASH=6feb4982d13f89656b61435b6b49e1996c61bc79e52d046d02312879376028e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Update GCC and MinGw for 31esr.
by mikeperry＠torproject.org 11 Oct '14

11 Oct '14

commit d6435c83fe7268ef479f2db7cfd145684a9ffcc2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Oct 11 00:55:04 2014 -0700 Update GCC and MinGw for 31esr. --- gitian/versions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index 41b8f69..440858e 100755 --- a/gitian/versions +++ b/gitian/versions @@ -16,7 +16,7 @@ HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable -MINGW_TAG=9418eaa1854320b57f40e29ec5bbc4f5717ecd58 # tag v3.1.0 +MINGW_TAG=469ed5d227202b373409c8a3b4c1358be39b9983 # XXX: ??? PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 FLASHPROXY_TAG=1.6 @@ -35,7 +35,7 @@ GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 -GCC_VER=4.8.3 +GCC_VER=4.9.1 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 @@ -94,7 +94,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff -GCC_HASH=6a8e4f11b185f4fe2ed9d7fc053e80f8c7e73f800c045f51f9d8bea33f080f1e +GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}

1 0

[tor-browser-bundle/master] Libfte accidentally removed its Makefile.
by mikeperry＠torproject.org 11 Oct '14

11 Oct '14

commit 4f01038967805a16259237ec76c2adb10b9dd999 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 10 22:44:37 2014 -0700 Libfte accidentally removed its Makefile. Not sure why we were asked to merge 0.1.0 without a makefile.. --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index 1ed612e..41b8f69 100755 --- a/gitian/versions +++ b/gitian/versions @@ -20,7 +20,7 @@ MINGW_TAG=9418eaa1854320b57f40e29ec5bbc4f5717ecd58 # tag v3.1.0 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 FLASHPROXY_TAG=1.6 -LIBFTE_TAG=58734a5aec563600fa8d82fb48ea9d6b8e26556c # tag 0.1.0 +LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2

1 0

[tor-browser-bundle/master] Revert "Use the commit for Tor Launcher as well."
by mikeperry＠torproject.org 11 Oct '14

11 Oct '14

commit f19acb8eabf8d0341861eef9a0d689254eb84516 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 10 18:09:41 2014 -0700 Revert "Use the commit for Tor Launcher as well." This reverts commit 72ec0faa93ceb840a897e2e6953334ced2a8ff7b. --- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/record-inputs.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 4106e74..68d53a1 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -84,7 +84,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 9a43685..2239d75 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -89,7 +89,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 56830a0..b140202 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -82,7 +82,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index 2c60e6e..eb368a9 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -36,7 +36,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG

1 0

[tor-browser-bundle/master] Revert "Also update the tag verification for Tor Launcher.."
by mikeperry＠torproject.org 11 Oct '14

11 Oct '14

commit dec6491f3d7c5cdbde15934fab1639d96c2ee088 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 10 18:09:00 2014 -0700 Revert "Also update the tag verification for Tor Launcher.." Go back to using tags for Tor Launcher. This reverts commit 6312ab050bfbcc9d70576c5cb993f923054b96a3. --- gitian/verify-tags.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 97bc56e..b359496 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -90,6 +90,7 @@ while read dir keyring tag; do verify_git "$dir" "$WRAPPER_DIR/gpg/$keyring" "$tag" done << EOF tbb-windows-installer tbb-windows-installer.gpg $NSIS_TAG +tor-launcher torbutton.gpg $TORLAUNCHER_TAG tor-browser torbutton.gpg $TORBROWSER_TAG torbutton torbutton.gpg $TORBUTTON_TAG zlib zlib.gpg $ZLIB_TAG @@ -111,7 +112,6 @@ libdmg-hfsplus $LIBDMG_TAG libfte $LIBFTE_TAG fteproxy $FTEPROXY_TAG txsocksx $TXSOCKSX_TAG -tor-launcher $TORLAUNCHER_TAG EOF # Verify signatures on signed packages

1 0

[tor-browser-bundle/master] Update tag for gitian-builder on the alpha branch.
by mikeperry＠torproject.org 11 Oct '14

11 Oct '14

commit 2ccbf33ce984cd0ab3af346e5b364cafb4103ac3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 10 18:10:24 2014 -0700 Update tag for gitian-builder on the alpha branch. --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index a9df723..14ce2d9 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -27,7 +27,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=0.2 MEEK_TAG=0.11 -GITIAN_TAG=tor-browser-builder-3.x-6 +GITIAN_TAG=tor-browser-builder-3.x-7 OPENSSL_VER=1.0.1i GMP_VER=5.1.3

1 0

[tor-browser-bundle/master] Update versions for 4.0-stable.
by mikeperry＠torproject.org 11 Oct '14

11 Oct '14

commit ab635e4b5abc1b8f543622dd3660bfd0f37302f9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 10 18:05:12 2014 -0700 Update versions for 4.0-stable. --- gitian/versions | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gitian/versions b/gitian/versions index 838d77c..4a35534 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,18 +1,18 @@ -TORBROWSER_VERSION=3.7pre +TORBROWSER_VERSION=4.0 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 -VERIFY_TAGS=0 +VERIFY_TAGS=1 -FIREFOX_VERSION=24.6.0esr +FIREFOX_VERSION=31.2.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1 -TOR_TAG=tor-0.2.4.22 -TORLAUNCHER_TAG=0.2.6.0 -TORBUTTON_TAG=1.6.9.0 -HTTPSE_TAG=3.4.5 # XXX: HTTPSE_VER is used instead, pending #11630 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1 +TOR_TAG=tor-0.2.5.8-rc +TORLAUNCHER_TAG=0.2.7.0.1 +TORBUTTON_TAG=1.7.0.1 +HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -27,9 +27,9 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=0.2 MEEK_TAG=0.11 -GITIAN_TAG=tor-browser-builder-3.x-6 +GITIAN_TAG=tor-browser-builder-3.x-7 -OPENSSL_VER=1.0.1g +OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -40,19 +40,19 @@ PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 -TWISTED_VER=13.1.0 +TWISTED_VER=13.2.0 M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=3.5.1 +HTTPSE_VER=5.0development.0 GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.33-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.42-fx+fn+sm.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -75,19 +75,19 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 +OPENSSL_HASH=3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=b2ea02e9ecf05d174a6d5b4cf1ee13d63cdad1c016160f3836aeeaa96790b189 -HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 +NOSCRIPT_HASH=b474156fd6b9957b38054a34c8acb581204f08733cce898ed581c67d425dda33 +HTTPSE_HASH=6feb4982d13f89656b61435b6b49e1996c61bc79e52d046d02312879376028e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc -TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 +TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 @@ -102,7 +102,7 @@ TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} -NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NOSCRIPT_PACKAGE} +NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIPT_PACKAGE} HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits