May 2019 - tor-commits - lists.torproject.org

[tor-launcher/master] Merge remote-tracking branch 'pc/bug29627-02'
by gk＠torproject.org 08 May '19

08 May '19

commit 0ce8339e490bb99096ff69cac17d648af028c951 Merge: 56b51a8 99035eb Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 3 12:54:48 2019 +0000 Merge remote-tracking branch 'pc/bug29627-02' src/chrome/content/network-settings.js | 16 ++++-- src/modules/tl-bridgedb.jsm | 96 ++++++++++++++++++++++++++++------ 2 files changed, 90 insertions(+), 22 deletions(-)

1 0

[tor-launcher/master] Bug 29627: Moat: add support for obfsproxy's meek_lite
by gk＠torproject.org 08 May '19

08 May '19

commit 99035eb7b6069c60fe4f97291abbea5af4fee886 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Mar 1 10:09:16 2019 -0500 Bug 29627: Moat: add support for obfsproxy's meek_lite Recognize "meek_lite" as a transport in addition to "meek". Use SOCKS args instead of command line parameters to pass the "url" (BridgeDB reflector) and "front" (BridgeDB front end) parameters to the PT binary. --- src/chrome/content/network-settings.js | 18 ++++--- src/modules/tl-bridgedb.jsm | 96 ++++++++++++++++++++++++++++------ 2 files changed, 91 insertions(+), 23 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 1599c28..fad89e5 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1,4 +1,4 @@ -// Copyright (c) 2018, The Tor Project, Inc. +// Copyright (c) 2019, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -542,18 +542,22 @@ function onOpenBridgeDBRequestPrompt() return; let meekClientPath; + let meekTransport; // We support both "meek" and "meek_lite". let meekClientArgs; reply.lineArray.forEach(aLine => { let tokens = aLine.split(' '); - if ((tokens.length > 2) && (tokens[0] == "meek") && (tokens[1] == "exec")) + if ((tokens.length > 2) && + ((tokens[0] == "meek") || (tokens[0] == "meek_lite")) && + (tokens[1] == "exec")) { + meekTransport = tokens[0]; meekClientPath = tokens[2]; meekClientArgs = tokens.slice(3); } }); - if (!meekClientPath) + if (!meekTransport) { reportMoatError(TorLauncherUtil.getLocalizedString("no_meek")); return; @@ -578,7 +582,8 @@ function onOpenBridgeDBRequestPrompt() resetBridgeDBRequestPrompt(); setBridgeDBRequestState("fetchingCaptcha"); overlay.hidden = false; - requestMoatCaptcha(proxySettings, meekClientPath, meekClientArgs); + requestMoatCaptcha(proxySettings, meekTransport, meekClientPath, + meekClientArgs); } } @@ -2508,7 +2513,8 @@ function createColonStr(aStr1, aStr2) } -function requestMoatCaptcha(aProxySettings, aMeekClientPath, aMeekClientArgs) +function requestMoatCaptcha(aProxySettings, aMeekTransport, + aMeekClientPath, aMeekClientArgs) { function cleanup(aMoatRequestor, aErr) { @@ -2543,7 +2549,7 @@ function requestMoatCaptcha(aProxySettings, aMeekClientPath, aMeekClientArgs) }; addBridgeDBRequestEventListener(kCaptchaCancelEventType, cancelListener); - moatRequestor.init(proxyURLFromSettings(aProxySettings), + moatRequestor.init(proxyURLFromSettings(aProxySettings), aMeekTransport, aMeekClientPath, aMeekClientArgs) .then(()=> { diff --git a/src/modules/tl-bridgedb.jsm b/src/modules/tl-bridgedb.jsm index 8b7a1d6..bc9b300 100644 --- a/src/modules/tl-bridgedb.jsm +++ b/src/modules/tl-bridgedb.jsm @@ -1,4 +1,4 @@ -// Copyright (c) 2018, The Tor Project, Inc. +// Copyright (c) 2019, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -61,7 +61,6 @@ function _MoatRequestor() _MoatRequestor.prototype = { kMaxResponseLength: 1024 * 400, - kTransport: "meek", kMoatContentType: "application/vnd.api+json", kMoatVersion: "0.1.0", kPrefBridgeDBFront: "extensions.torlauncher.bridgedb_front", @@ -74,6 +73,9 @@ _MoatRequestor.prototype = kMoatCheckRequestType: "moat-solution", kMoatCheckResponseType: "moat-bridges", + kMozProxyTypeSocks4: "socks4", + kMozProxyTypeSocks5: "socks", + kStateIdle: 0, kStateWaitingForVersion: 1, kStateWaitingForProxyDone: 2, @@ -83,19 +85,22 @@ _MoatRequestor.prototype = mState: this.kStateIdle, + mMeekTransport: undefined, mLocalProxyURL: undefined, mMeekFront: undefined, // Frontend server, if we are using one. + mMeekClientEscapedArgs: undefined, mMeekClientProcess: undefined, mMeekClientStdoutBuffer: undefined, - mMeekClientProxyType: undefined, // contains Mozilla names such as socks4 + mMeekClientProxyType: undefined, // kMozProxyTypeSocks4 or kMozProxyTypeSocks5 mMeekClientIP: undefined, mMeekClientPort: undefined, mMoatResponseListener: undefined, mUserCanceled: false, // Returns a promise. - init: function(aProxyURL, aMeekClientPath, aMeekClientArgs) + init: function(aProxyURL, aMeekTransport, aMeekClientPath, aMeekClientArgs) { + this.mMeekTransport = aMeekTransport; this.mLocalProxyURL = aProxyURL; return this._startMeekClient(aMeekClientPath, aMeekClientArgs); }, @@ -208,21 +213,24 @@ _MoatRequestor.prototype = meekClientPath = f.path; } - // Construct the args array. - let args = aMeekClientArgs.slice(); // make a copy + // Construct the per-connection arguments. + this.mMeekClientEscapedArgs = ""; let meekReflector = TorLauncherUtil.getCharPref(this.kPrefBridgeDBReflector); if (meekReflector) { - args.push("-url"); - args.push(meekReflector); + this.mMeekClientEscapedArgs += "url="; + this.mMeekClientEscapedArgs += this._escapeArgValue(meekReflector); } this.mMeekFront = TorLauncherUtil.getCharPref(this.kPrefBridgeDBFront); if (this.mMeekFront) { - args.push("-front"); - args.push(this.mMeekFront); + if (this.mMeekClientEscapedArgs.length > 0) + this.mMeekClientEscapedArgs += ';'; + this.mMeekClientEscapedArgs += "front="; + this.mMeekClientEscapedArgs += this._escapeArgValue(this.mMeekFront); } + // Setup environment and start the meek client process. let ptStateDir = TorLauncherUtil.getTorFile("tordatadir", false); let meekHelperProfileDir = TorLauncherUtil.getTorFile("pt-profiles-dir", true); @@ -238,17 +246,19 @@ _MoatRequestor.prototype = let envAdditions = { TOR_PT_MANAGED_TRANSPORT_VER: "1", TOR_PT_STATE_LOCATION: ptStateDir.path, TOR_PT_EXIT_ON_STDIN_CLOSE: "1", - TOR_PT_CLIENT_TRANSPORTS: this.kTransport, + TOR_PT_CLIENT_TRANSPORTS: this.mMeekTransport, TOR_BROWSER_MEEK_PROFILE: meekHelperProfileDir.path }; if (this.mLocalProxyURL) envAdditions.TOR_PT_PROXY = this.mLocalProxyURL; TorLauncherLogger.log(3, "starting " + meekClientPath + " in " + workDir.path); - TorLauncherLogger.log(3, "args " + JSON.stringify(args)); + TorLauncherLogger.log(3, "args " + JSON.stringify(aMeekClientArgs)); TorLauncherLogger.log(3, "env additions " + JSON.stringify(envAdditions)); + TorLauncherLogger.log(3, "per-connection args \"" + + this.mMeekClientEscapedArgs + "\""); let opts = { command: meekClientPath, - arguments: args, + arguments: aMeekClientArgs, workdir: workDir.path, environmentAppend: true, environment: envAdditions, @@ -271,6 +281,21 @@ _MoatRequestor.prototype = }); }, // _startMeekClient + // Escape aValue per section 3.5 of the PT specification: + // First the "<Key>=<Value>" formatted arguments MUST be escaped, + // such that all backslash, equal sign, and semicolon characters + // are escaped with a backslash. + _escapeArgValue: function(aValue) + { + if (!aValue) + return ""; + + let rv = aValue.replace(/\\/g, "\\\\"); + rv = rv.replace(/=/g, "\\="); + rv = rv.replace(/;/g, "\\;"); + return rv; + }, + // Returns a promise that is resolved when the PT handshake finishes. _meekClientHandshake: function(aMeekClientProc) { @@ -389,7 +414,7 @@ _MoatRequestor.prototype = { errMsg = "Invalid CMETHOD response (too few parameters)."; } - else if (tokens[1] != this.kTransport) + else if (tokens[1] != this.mMeekTransport) { errMsg = "Unexpected transport " + tokens[1] + " in CMETHOD response."; @@ -399,11 +424,11 @@ _MoatRequestor.prototype = let proxyType = tokens[2]; if (proxyType == "socks5") { - this.mMeekClientProxyType = "socks"; + this.mMeekClientProxyType = this.kMozProxyTypeSocks5; } else if ((proxyType == "socks4a") || (proxyType == "socks4")) { - this.mMeekClientProxyType = "socks4"; + this.mMeekClientProxyType = this.kMozProxyTypeSocks4; } else { @@ -466,12 +491,49 @@ _MoatRequestor.prototype = // Based on meek/firefox/components/main.js _sendMoatRequest: function(aRequestObj, aIsCheck) { + // Include arguments per section 3.5 of the PT specification: + // Lastly the arguments are transmitted when making the outgoing + // connection using the authentication mechanism specific to the + // SOCKS protocol version. + // + // - In the case of SOCKS 4, the concatenated argument list is + // transmitted in the "USERID" field of the "CONNECT" request. + // + // - In the case of SOCKS 5, the parent process must negotiate + // "Username/Password" authentication [RFC1929], and transmit + // the arguments encoded in the "UNAME" and "PASSWD" fields. + // + // If the encoded argument list is less than 255 bytes in + // length, the "PLEN" field must be set to "1" and the "PASSWD" + // field must contain a single NUL character. + + let userName = ""; + let password = undefined; + if (this.mMeekClientProxyType == this.kMozProxyTypeSocks4) + { + userName = this.mMeekClientEscapedArgs; + } + else + { + if (this.mMeekClientEscapedArgs.length <= 255) + { + userName = this.mMeekClientEscapedArgs; + password = "\x00"; + } + else + { + userName = this.mMeekClientEscapedArgs.substring(0, 255); + password = this.mMeekClientEscapedArgs.substring(255); + } + } + let proxyPS = Cc["@mozilla.org/network/protocol-proxy-service;1"] .getService(Ci.nsIProtocolProxyService); let flags = Ci.nsIProxyInfo.TRANSPARENT_PROXY_RESOLVES_HOST; let noTimeout = 0xFFFFFFFF; // UINT32_MAX - let proxyInfo = proxyPS.newProxyInfo(this.mMeekClientProxyType, + let proxyInfo = proxyPS.newProxyInfoWithAuth(this.mMeekClientProxyType, this.mMeekClientIP, this.mMeekClientPort, + userName, password, flags, noTimeout, undefined); let uriStr = TorLauncherUtil.getCharPref(this.kPrefMoatService); if (!uriStr)

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] Revert "Bug 30388: Disable nocertdb pref for armagadd-on 2.0 cert inclusion if needed"
by gk＠torproject.org 08 May '19

08 May '19

commit 7f0035949b56c64a52b63d0289ad689cd66633ad Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 8 21:06:32 2019 +0000 Revert "Bug 30388: Disable nocertdb pref for armagadd-on 2.0 cert inclusion if needed" This reverts commit 1d2d420ff1c7231a60ec3ff497bd57815fc1d665. --- toolkit/mozapps/extensions/internal/XPIProvider.jsm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index 3aa0e41b625f..6cffc02d90ba 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -1824,13 +1824,6 @@ function addMissingIntermediateCertificate() { } logger.debug("hotfix for addon signing cert has not been applied; applying"); - // temporarily disable nocertb so we can write cert - const PREF_NOCERTDB = "security.nocertdb"; - let userNocertdb = Services.prefs.getBoolPref(PREF_NOCERTDB, true); - if (userNocertdb) { - Services.prefs.setBoolPref(PREF_NOCERTDB, false); - } - try { let certDB = Cc["@mozilla.org/security/x509certdb;1"].getService(Ci.nsIX509CertDB); certDB.addCertFromBase64(MISSING_INTERMEDIATE_CERTIFICATE, ",,"); @@ -1838,11 +1831,6 @@ function addMissingIntermediateCertificate() { } catch (e) { logger.error("failed to add new intermediate certificate:", e); return; - } finally { - // revert nocertdb pref to original value (even if exception thrown) - if (userNocertdb) { - Services.prefs.setBoolPref(PREF_NOCERTDB, true); - } } Services.prefs.setBoolPref(PREF_SIGNER_HOTFIXED, true);

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 30388: Set security.nocertdb to false for now
by gk＠torproject.org 08 May '19

08 May '19

commit c46b9fd16d0de6022e00d96d9959b2778908da7d Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 6 09:17:41 2019 +0000 Bug 30388: Set security.nocertdb to false for now --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index c810c18a84a1..b6fcff155af8 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -48,7 +48,7 @@ pref("browser.cache.offline.enable", false); pref("permissions.memory_only", true); pref("network.cookie.lifetimePolicy", 2); pref("browser.download.manager.retention", 1); -pref("security.nocertdb", true); +pref("security.nocertdb", false); // Disk activity: TBB Directory Isolation pref("browser.download.useDownloadDir", false);

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] Pulling in new Torbutton release
by gk＠torproject.org 08 May '19

08 May '19

commit 6c18d3df29231e34f85c3ad974ea16c91c4e10f1 Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 6 20:49:49 2019 +0000 Pulling in new Torbutton release --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 717715be0827..e702dfcb7731 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 717715be0827e3c4c9d4a6815f3c8027de3cee7e +Subproject commit e702dfcb7731c11787ab6f8c42cc8fe9b204cdc7

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 30136: Use 'Tor Browser' as brand name on mobile, too
by gk＠torproject.org 08 May '19

08 May '19

commit 3d5e5cc086f443c5ab5a0125a174d3e5f50181a2 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 29 12:22:19 2019 +0000 Bug 30136: Use 'Tor Browser' as brand name on mobile, too --- mobile/android/branding/alpha/configure.sh | 2 +- mobile/android/branding/alpha/locales/en-US/brand.dtd | 2 +- mobile/android/branding/alpha/locales/en-US/brand.properties | 2 +- mobile/android/branding/nightly/configure.sh | 2 +- mobile/android/branding/nightly/locales/en-US/brand.dtd | 2 +- mobile/android/branding/nightly/locales/en-US/brand.properties | 2 +- mobile/android/branding/official/configure.sh | 2 +- mobile/android/branding/official/locales/en-US/brand.dtd | 2 +- mobile/android/branding/official/locales/en-US/brand.properties | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mobile/android/branding/alpha/configure.sh b/mobile/android/branding/alpha/configure.sh index 1fd6385c5a06..88e260f94a2e 100644 --- a/mobile/android/branding/alpha/configure.sh +++ b/mobile/android/branding/alpha/configure.sh @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -MOZ_APP_DISPLAYNAME="Tor Browser for Android (Alpha)" +MOZ_APP_DISPLAYNAME="Tor Browser (Alpha)" ANDROID_PACKAGE_NAME=org.torproject.torbrowser_alpha MOZ_UPDATER= MOZ_ANDROID_ANR_REPORTER= diff --git a/mobile/android/branding/alpha/locales/en-US/brand.dtd b/mobile/android/branding/alpha/locales/en-US/brand.dtd index 01346be36a7c..7200cc0f316b 100644 --- a/mobile/android/branding/alpha/locales/en-US/brand.dtd +++ b/mobile/android/branding/alpha/locales/en-US/brand.dtd @@ -3,7 +3,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <!ENTITY brandShortName "Tor Browser"> -<!ENTITY brandFullName "Tor Browser for Android"> +<!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "The Tor Project"> <!ENTITY brandPocket ""> diff --git a/mobile/android/branding/alpha/locales/en-US/brand.properties b/mobile/android/branding/alpha/locales/en-US/brand.properties index 12ebf8a5d205..db8634d73141 100644 --- a/mobile/android/branding/alpha/locales/en-US/brand.properties +++ b/mobile/android/branding/alpha/locales/en-US/brand.properties @@ -3,4 +3,4 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. brandShortName=Tor Browser -brandFullName=Tor Browser for Android +brandFullName=Tor Browser diff --git a/mobile/android/branding/nightly/configure.sh b/mobile/android/branding/nightly/configure.sh index 47761caf31f4..15f53597468d 100644 --- a/mobile/android/branding/nightly/configure.sh +++ b/mobile/android/branding/nightly/configure.sh @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -MOZ_APP_DISPLAYNAME="Tor Browser for Android (Nightly)" +MOZ_APP_DISPLAYNAME="Tor Browser (Nightly)" ANDROID_PACKAGE_NAME=org.torproject.torbrowser_nightly MOZ_UPDATER= MOZ_ANDROID_ANR_REPORTER= diff --git a/mobile/android/branding/nightly/locales/en-US/brand.dtd b/mobile/android/branding/nightly/locales/en-US/brand.dtd index 01346be36a7c..7200cc0f316b 100644 --- a/mobile/android/branding/nightly/locales/en-US/brand.dtd +++ b/mobile/android/branding/nightly/locales/en-US/brand.dtd @@ -3,7 +3,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <!ENTITY brandShortName "Tor Browser"> -<!ENTITY brandFullName "Tor Browser for Android"> +<!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "The Tor Project"> <!ENTITY brandPocket ""> diff --git a/mobile/android/branding/nightly/locales/en-US/brand.properties b/mobile/android/branding/nightly/locales/en-US/brand.properties index 12ebf8a5d205..db8634d73141 100644 --- a/mobile/android/branding/nightly/locales/en-US/brand.properties +++ b/mobile/android/branding/nightly/locales/en-US/brand.properties @@ -3,4 +3,4 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. brandShortName=Tor Browser -brandFullName=Tor Browser for Android +brandFullName=Tor Browser diff --git a/mobile/android/branding/official/configure.sh b/mobile/android/branding/official/configure.sh index aa8b56336ccc..4da3d246d3c5 100644 --- a/mobile/android/branding/official/configure.sh +++ b/mobile/android/branding/official/configure.sh @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -MOZ_APP_DISPLAYNAME="Tor Browser for Android" +MOZ_APP_DISPLAYNAME="Tor Browser" ANDROID_PACKAGE_NAME=org.torproject.torbrowser MOZ_UPDATER= MOZ_ANDROID_ANR_REPORTER= diff --git a/mobile/android/branding/official/locales/en-US/brand.dtd b/mobile/android/branding/official/locales/en-US/brand.dtd index 01346be36a7c..7200cc0f316b 100644 --- a/mobile/android/branding/official/locales/en-US/brand.dtd +++ b/mobile/android/branding/official/locales/en-US/brand.dtd @@ -3,7 +3,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <!ENTITY brandShortName "Tor Browser"> -<!ENTITY brandFullName "Tor Browser for Android"> +<!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "The Tor Project"> <!ENTITY brandPocket ""> diff --git a/mobile/android/branding/official/locales/en-US/brand.properties b/mobile/android/branding/official/locales/en-US/brand.properties index 12ebf8a5d205..db8634d73141 100644 --- a/mobile/android/branding/official/locales/en-US/brand.properties +++ b/mobile/android/branding/official/locales/en-US/brand.properties @@ -3,4 +3,4 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. brandShortName=Tor Browser -brandFullName=Tor Browser for Android +brandFullName=Tor Browser

1 0

[bridgedb/master] Provide more information in log messages.
by phw＠torproject.org 08 May '19

08 May '19

commit 978f9be81c6e7110d8c40bc76b22230f87b1d988 Author: Philipp Winter <phw(a)nymity.ch> Date: Wed May 8 13:40:23 2019 -0700 Provide more information in log messages. Another attempt to get a better understanding of <https://bugs.torproject.org/30441>. --- bridgedb/main.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bridgedb/main.py b/bridgedb/main.py index a707952..a513c70 100644 --- a/bridgedb/main.py +++ b/bridgedb/main.py @@ -178,8 +178,8 @@ def load(state, hashring, clear=False): blacklist = parseBridgeBlacklistFile(state.NO_DISTRIBUTION_FILE) inserted = 0 - logging.info("Inserting %d bridges into hashring, %d of which have the " - "'Running' flag..." % (len(bridges), + logging.info("Trying to insert %d bridges into hashring, %d of which " + "have the 'Running' flag..." % (len(bridges), len(filter(lambda b: b.flags.running, bridges.values())))) for fingerprint, bridge in bridges.items(): @@ -198,7 +198,8 @@ def load(state, hashring, clear=False): # insertion process. hashring.insert(bridge) inserted += 1 - logging.info("Done inserting %d bridges into hashring." % inserted) + logging.info("Tried to insert %d bridges into hashring. Resulting " + "hashring is of length %d." % (inserted, len(hashring))) if state.COLLECT_TIMESTAMPS: reactor.callInThread(updateBridgeHistory, bridges, timestamps)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 08 May '19

08 May '19

commit e4ced1f4dd214a595df817654bbdecb15b767a22 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 8 19:50:47 2019 +0000 Update translations for support-portal --- contents+it.po | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/contents+it.po b/contents+it.po index 6d31a3fbc..23f223345 100644 --- a/contents+it.po +++ b/contents+it.po @@ -569,6 +569,8 @@ msgid "" "gpg: Good signature from \"Tor Browser Developers (signing key) " "<torbrowser(a)torproject.org>\" [unknown]" msgstr "" +"gpg: Firma buona da \"Tor Browser Developers (signing key) " +"<torbrowser(a)torproject.org>\" [unknown]" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -594,12 +596,12 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "Subkey fingerprint: 1107 75B5 D101 FB36 BC6C 911B EB77 4491 D9FF 06E2" -msgstr "" +msgstr "Subkey fingerprint: 1107 75B5 D101 FB36 BC6C 911B EB77 4491 D9FF 06E2" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "Currently valid subkey fingerprints are:" -msgstr "" +msgstr "Le impronte subkey attualmente valide sono:" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -682,6 +684,7 @@ msgstr "" #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "gpg --keyserver pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290" msgstr "" +"gpg --keyserver pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -733,11 +736,13 @@ msgid "" "gpg: Good signature from \"Tor Browser Developers (signing key) " "<torbrowser&at;torproject.org>\" [unknown]" msgstr "" +"gpg: Firma buona da \"Tor Browser Developers (signing key) " +"<torbrowser&at;torproject.org>\" [unknown]" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "Subkey fingerprint: A430 0A6B C93C 0877 A445 1486 D148 3FA6 C3C0 7136" -msgstr "" +msgstr "Subkey fingerprint: A430 0A6B C93C 0877 A445 1486 D148 3FA6 C3C0 7136" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -1901,6 +1906,9 @@ msgid "" "installing and testing [Tor Browser Alpha " "releases](https://www.torproject.org/download/alpha/)." msgstr "" +"Puoi inoltro aiutarci a provare i prossimi linguaggi che saranno rilasciati," +" installando e provando [Tor Browser Alpha " +"releases](https://www.torproject.org/it/download/alpha/)." #: https//support.torproject.org/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.title) @@ -2324,7 +2332,7 @@ msgstr "" #: https//support.torproject.org/tormessenger/tormessenger-1/ #: (content/tormessenger/tormessenger-1/contents+en.lrquestion.description) msgid "Do you? [Contact us](https://www.torproject.org/contact)." -msgstr "" +msgstr "E tu? [Contattaci](https://www.torproject.org/it/contact/)." #: https//support.torproject.org/tormobile/tormobile-1/ #: (content/tormobile/tormobile-1/contents+en.lrquestion.title)

1 0

[bridgedb/master] Enhance log message.
by phw＠torproject.org 08 May '19

08 May '19

commit d15fe16cfdbcf7514e74f537f78ba55bd7229dd8 Author: Philipp Winter <phw(a)nymity.ch> Date: Wed May 8 10:01:20 2019 -0700 Enhance log message. This will hopefully help us understand <https://bugs.torproject.org/30441>. --- bridgedb/main.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bridgedb/main.py b/bridgedb/main.py index 586ed83..a707952 100644 --- a/bridgedb/main.py +++ b/bridgedb/main.py @@ -178,7 +178,10 @@ def load(state, hashring, clear=False): blacklist = parseBridgeBlacklistFile(state.NO_DISTRIBUTION_FILE) inserted = 0 - logging.info("Inserting %d bridges into hashring..." % len(bridges)) + logging.info("Inserting %d bridges into hashring, %d of which have the " + "'Running' flag..." % (len(bridges), + len(filter(lambda b: b.flags.running, bridges.values())))) + for fingerprint, bridge in bridges.items(): # Skip insertion of bridges which are geolocated to be in one of the # NO_DISTRIBUTION_COUNTRIES, a.k.a. the countries we don't distribute

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 08 May '19

08 May '19

commit b512002c8bd1a34950610d19e837bfc4eb5ce2fd Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 8 19:21:02 2019 +0000 Update translations for support-portal_completed --- contents+fr.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index f26680461..4d53874bb 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1836,7 +1836,7 @@ msgid "" "default because it would cause so many problems for them." msgstr "" "La plupart des utilisateurs abandonneraient complètement Tor si nous " -"désactivions JavaScript par défaut car cela leur causerait tant de " +"désactivions JavaScript par défaut, car cela leur causerait tant de " "problèmes." #: https//support.torproject.org/tbb/tbb-34/ @@ -1846,9 +1846,9 @@ msgid "" "making it usable for the majority of people, so for now, that means leaving " "JavaScript enabled by default." msgstr "" -"En fin de compte, nous voulons rendre le Navigateur Tor aussi sécurisé que " -"possible tout en le rendant utilisable pour la majorité des gens, donc pour " -"l’instant, cela signifie laisser JavaScript activé par défaut." +"Nous voulons fondamentalement rendre le Navigateur Tor aussi sécurisé que " +"possible tout en nous assurant qu’une majorité de personnes peut l’utiliser." +" Cela signifie donc que pour l’instant JavaScript reste activé par défaut." #: https//support.torproject.org/tbb/tbb-34/ #: (content/tbb/tbb-34/contents+en.lrquestion.description) @@ -1857,10 +1857,10 @@ msgid "" " we recommend changing your Tor Browser's security slider (in the Tor " "Browser Onion menu under \"Security Settings\")." msgstr "" -"Pour les utilisateurs qui veulent désactiver JavaScript sur tous les sites " -"HTTP par défaut, nous recommandons de changer le curseur de sécurité de " -"votre Navigateur Tor (dans le menu Onion du Navigateur Tor, sous \" " -"paramètres de sécurité \")." +"Pour les utilisateurs qui veulent que JavaScript soit désactivé par défaut " +"sur tous les sites HTTP, nous recommandons de changer le curseur de sécurité" +" de votre Navigateur Tor (dans le menu Onion du Navigateur Tor, sous « " +"Paramètres de sécurité »)." #: https//support.torproject.org/tbb/tbb-34/ #: (content/tbb/tbb-34/contents+en.lrquestion.description) @@ -1868,8 +1868,8 @@ msgid "" "The low/default setting allows JavaScript, but the medium and high levels " "both block JavaScript on HTTP sites." msgstr "" -"Le réglage bas/défaut autorise JavaScript, mais les niveaux moyen et élevé " -"bloquent JavaScript sur les sites HTTP." +"Le réglage « Normal » par défaut autorise JavaScript, mais les niveaux « " +"Plus sûr » et « Le plus sûr » bloquent JavaScript sur les sites HTTP." #: https//support.torproject.org/tbb/tbb-35/ #: (content/tbb/tbb-35/contents+en.lrquestion.title)

1 0