tbb-commits April 2016

tbb-commits@lists.torproject.org

2 participants
89 discussions

[tor-browser-bundle/hardened-builds] Bumping gitian-builder tag for nightlies
by gk＠torproject.org 11 Apr '16

11 Apr '16

commit db4f5aa9836c36f3cad96c3677bd058f5a9cd19c Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 29 12:26:41 2016 +0000 Bumping gitian-builder tag for nightlies --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 43c3c9a..e7c5b3d 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -43,7 +43,7 @@ GO_X_NET_TAG=master OBFS4_TAG=master NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -GITIAN_TAG=tor-browser-builder-3.x-9 +GITIAN_TAG=tor-browser-builder-4 OPENSSL_VER=1.0.1q GMP_VER=5.1.3

1 0

[torbutton/master] Bug 18466: Prevent ReferenceErrors in tor-control-port.js
by gk＠torproject.org 08 Apr '16

08 Apr '16

commit e6939a0043b8fc944ecfa4559efbd503d1d758c1 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Mar 2 17:27:25 2016 -0800 Bug 18466: Prevent ReferenceErrors in tor-control-port.js --- src/modules/tor-control-port.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index e1ee6bc..1cef898 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -39,7 +39,7 @@ log("Loading tor-control-port.js\n"); // ## io // I/O utilities namespace -let io = io || {}; +let io = {}; // __io.asyncSocketStreams(host, port)__. // Creates a pair of asynchronous input and output streams for a socket at the @@ -286,7 +286,7 @@ io.controlSocket = function (host, port, password, onError) { // ## utils // A namespace for utility functions -let utils = utils || {}; +let utils = {}; // __utils.identity(x)__. // Returns its argument unchanged. @@ -390,7 +390,7 @@ utils.rejectPromise = errorMessage => Promise.reject(new Error(errorMessage)); // ## info // A namespace for functions related to tor's GETINFO and GETCONF command. -let info = info || {}; +let info = {}; // __info.keyValueStringsFromMessage(messageText)__. // Takes a message (text) response to GETINFO or GETCONF and provides @@ -567,7 +567,7 @@ info.getConf = function (aControlSocket, key) { // ## event // Handlers for events -let event = event || {}; +let event = {}; // __event.parsers__. // A map of EVENT keys to parsing functions, which convert result strings to JavaScript @@ -603,7 +603,7 @@ event.watchEvent = function (controlSocket, type, filter, onData) { // ## tor // Things related to the main controller. -let tor = tor || {}; +let tor = {}; // __tor.controllerCache__. // A map from "host:port" to controller objects. Prevents redundant instantiation

1 0

[torbutton/master] Bug 18466: Get domain isolator working with FF45
by gk＠torproject.org 08 Apr '16

08 Apr '16

commit d454bd4ac3eb71b3945ff64704bb87fdb211d711 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Mar 2 16:45:08 2016 -0800 Bug 18466: Get domain isolator working with FF45 --- src/components/domain-isolator.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index caf45cf..2639322 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -18,7 +18,7 @@ let logger = Cc["@torproject.org/torbutton-logger;1"] // ## mozilla namespace. // Useful functionality for interacting with Mozilla services. -let mozilla = mozilla || {}; +let mozilla = {}; // __mozilla.protocolProxyService__. // Mozilla's protocol proxy service, useful for managing proxy connections made @@ -47,7 +47,7 @@ mozilla.registerProxyChannelFilter = function (filterFunction, positionIndex) { }; // ## tor functionality. -let tor = tor || {}; +let tor = {}; // __tor.noncesForDomains__. // A mutable map that records what nonce we are using for each domain. @@ -73,13 +73,14 @@ tor.socksProxyCredentials = function (originalProxy, domain) { } let proxy = originalProxy.QueryInterface(Ci.nsIProxyInfo); return mozilla.protocolProxyService - .newSOCKSProxyInfo(proxy.host, - proxy.port, - domain, // username - tor.noncesForDomains[domain].toString(), // password - proxy.flags, - proxy.failoverTimeout, - proxy.failoverProxy); + .newProxyInfoWithAuth("socks", + proxy.host, + proxy.port, + domain, // username + tor.noncesForDomains[domain].toString(), // password + proxy.flags, + proxy.failoverTimeout, + proxy.failoverProxy); }; tor.newCircuitForDomain = function(domain) {

1 0

[torbutton/master] Bug 18466: Make Torbutton compatible with ESR45
by gk＠torproject.org 08 Apr '16

08 Apr '16

commit e4f7079dd5d4ae44b8d10b48889d165eba20a660 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 7 09:51:05 2016 +0000 Bug 18466: Make Torbutton compatible with ESR45 Our usage of |let| does not work anymore since changes in Firefox 44 landed. See: https://bugzilla.mozilla.org/show_bug.cgi?id=589199. --- src/components/domain-isolator.js | 6 +++--- src/modules/tor-control-port.js | 2 +- src/modules/utils.js | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index 2639322..6cfd21e 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -30,7 +30,7 @@ mozilla.protocolProxyService = Cc["@mozilla.org/network/protocol-proxy-service;1 // Mozilla's Thirdy Party Utilities, for figuring out first party domain. mozilla.thirdPartyUtil = Cc["@mozilla.org/thirdpartyutil;1"] .getService(Ci.mozIThirdPartyUtil); - + // __mozilla.registerProxyChannelFilter(filterFunction, positionIndex)__. // Registers a proxy channel filter with the Mozilla Protocol Proxy Service, // which will help to decide the proxy to be used for a given channel. @@ -63,7 +63,7 @@ tor.unknownDirtySince = Date.now(); // __tor.socksProxyCredentials(originalProxy, domain)__. // Takes a proxyInfo object (originalProxy) and returns a new proxyInfo -// object with the same properties, except the username is set to the +// object with the same properties, except the username is set to the // the domain, and the password is a nonce. tor.socksProxyCredentials = function (originalProxy, domain) { // Check if we already have a nonce. If not, create @@ -113,7 +113,7 @@ tor.isolateCircuitsByDomain = function () { proxy = aProxy.QueryInterface(Ci.nsIProxyInfo), replacementProxy = tor.socksProxyCredentials(aProxy, firstPartyDomain); logger.eclog(3, "tor SOCKS: " + channel.URI.spec + " via " + - replacementProxy.username + ":" + replacementProxy.password); + replacementProxy.username + ":" + replacementProxy.password); return replacementProxy; } catch (err) { logger.eclog(3, err.message); diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index 1cef898..63c2cd9 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -641,7 +641,7 @@ tor.controller = function (host, port, password, onError) { // let replyPromise = c.getInfo("ip-to-country/16.16.16.16"); // // Close the controller permanently // c.close(); -let controller = function (host, port, password, onError) { +var controller = function (host, port, password, onError) { let dest = host + ":" + port, maybeController = tor.controllerCache[dest]; return (tor.controllerCache[dest] = diff --git a/src/modules/utils.js b/src/modules/utils.js index de3cca6..eb0746b 100644 --- a/src/modules/utils.js +++ b/src/modules/utils.js @@ -14,7 +14,7 @@ let prefs = Services.prefs; // __getPrefValue(prefName)__ // Returns the current value of a preference, regardless of its type. -let getPrefValue = function (prefName) { +var getPrefValue = function (prefName) { switch(prefs.getPrefType(prefName)) { case prefs.PREF_BOOL: return prefs.getBoolPref(prefName); case prefs.PREF_INT: return prefs.getIntPref(prefName); @@ -27,7 +27,7 @@ let getPrefValue = function (prefName) { // Applies prefHandler to the current value of pref specified by prefName. // Re-applies prefHandler whenever the value of the pref changes. // Returns a zero-arg function that unbinds the pref. -let bindPrefAndInit = function (prefName, prefHandler) { +var bindPrefAndInit = function (prefName, prefHandler) { let update = () => { prefHandler(getPrefValue(prefName)); }, observer = { observe : function (subject, topic, data) { if (data === prefName) { @@ -48,7 +48,7 @@ let env = Components.classes["@mozilla.org/process/environment;1"] // __getEnv(name)__. // Reads the environment variable of the given name. -let getEnv = function (name) { +var getEnv = function (name) { return env.exists(name) ? env.get(name) : undefined; };

1 0

[tor-browser-bundle/hardened-builds] Bug 18726: Add GreenBelt to default bridges
by gk＠torproject.org 07 Apr '16

07 Apr '16

commit 23021b90d1283e3ef1ad13969305ab7a395e4c9d Author: Nima Fatemi <nima(a)torproject.org> Date: Thu Apr 7 00:08:03 2016 +0000 Bug 18726: Add GreenBelt to default bridges --- Bundle-Data/PTConfigs/bridge_prefs.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index aa0d147..390d7a5 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -34,6 +34,9 @@ pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.10:80 8F pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:60873 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[tor-browser-bundle/maint-5.5] Bug 18726: Add GreenBelt to default bridges
by gk＠torproject.org 07 Apr '16

07 Apr '16

commit 412652628c775ca77f3699bf408af5936c7b0b4a Author: Nima Fatemi <nima(a)torproject.org> Date: Thu Apr 7 00:08:03 2016 +0000 Bug 18726: Add GreenBelt to default bridges --- Bundle-Data/PTConfigs/bridge_prefs.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index aa0d147..390d7a5 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -34,6 +34,9 @@ pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.10:80 8F pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:60873 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[tor-browser-bundle/master] Bug 18726: Add GreenBelt to default bridges
by gk＠torproject.org 07 Apr '16

07 Apr '16

commit bc9d708e1f0617050fe5572732b7a812f62936c1 Author: Nima Fatemi <nima(a)torproject.org> Date: Thu Apr 7 00:08:03 2016 +0000 Bug 18726: Add GreenBelt to default bridges --- Bundle-Data/PTConfigs/bridge_prefs.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index aa0d147..390d7a5 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -34,6 +34,9 @@ pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.10:80 8F pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:60873 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[tor-browser-bundle/master] Bumping nightly NoScript version
by gk＠torproject.org 05 Apr '16

05 Apr '16

commit 8aca4d8c70e7797a56f0dab6d36b4ec5fe69304b Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 5 09:05:30 2016 +0000 Bumping nightly NoScript version --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index fe94a04..17f3476 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -68,7 +68,7 @@ GO_VER=1.4.2 ## 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.9.0.4-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.10-sm+fx+fn.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 OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -100,7 +100,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=94d036ff45116023bde97e6dee6c79daf2d28804764bfa8937f5d4d3463173f5 +NOSCRIPT_HASH=9861b1e0bf5d12f773f4b26c3268d4257c3dc47a27b732ad4c280cd34bf45dd8 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Bug 18698: Include libgconf2-dev for our Linux builds
by gk＠torproject.org 01 Apr '16

01 Apr '16

commit ffbe0cbb99ba7bad3068ee2f55a07946ada78695 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Apr 1 01:16:09 2016 +0000 Bug 18698: Include libgconf2-dev for our Linux builds --- gitian/descriptors/linux/gitian-firefox.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index f7ea1c6..6398af5 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -20,6 +20,8 @@ packages: - "python-dev" # To pass configure since ESR 31. - "libpulse-dev" +# To pass configure since ESR 45. +- "libgconf2-dev" # We built GCC but not the libmpc2, thus we need to install it. - "libmpc2" reference_datetime: "2000-01-01 00:00:00"

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits April 2016