- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-68.9.0esr-10.0-1] fixup! Bug 30237: Add v3 onion services client authentication prompt
by gk＠torproject.org 11 Jun '20

11 Jun '20

commit 632beb89a79f17bdb0db266196c39b67fc11561f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jun 8 11:11:28 2020 -0400 fixup! Bug 30237: Add v3 onion services client authentication prompt Fixes bug 34369. --- browser/modules/TorStrings.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm index 05bbfd63ef60..8f3a9ce838b8 100644 --- a/browser/modules/TorStrings.jsm +++ b/browser/modules/TorStrings.jsm @@ -333,7 +333,7 @@ var TorStrings = { let retval = { learnMore: getString("learnMore", "Learn more"), - learnMoreURL: `https://2019.www.torproject.org/docs/tor-manual-dev.html.${getLocale()}#_client_authorization`, + learnMoreURL: `https://support.torproject.org/${getLocale()}/onionservices/client-auth/`, errorPage: { browser: getString("errorPage.browser", "Browser"), network: getString("errorPage.network", "Network"),

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] fixup! Bug 21952: Implement Onion-Location
by gk＠torproject.org 11 Jun '20

11 Jun '20

commit 8c3168ab58f038cc1e72d2f408bee1e5f715c455 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jun 9 14:59:00 2020 -0400 fixup! Bug 21952: Implement Onion-Location Fixes bug 34379. --- browser/modules/TorStrings.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm index 66c44257c163..05bbfd63ef60 100644 --- a/browser/modules/TorStrings.jsm +++ b/browser/modules/TorStrings.jsm @@ -434,7 +434,7 @@ var TorStrings = { tryThis: getString("tryThis", "Try this: Onionsite"), onionAvailable: getString("onionAvailable", "Onionsite available"), learnMore: getString("learnMore", "Learn more"), - learnMoreURL: `https://tb-manual.torproject.org/${getLocale()}`, // TODO: replace when manual page is available. + learnMoreURL: `https://tb-manual.torproject.org/${getLocale()}/onion-services/`, always: getString("always", "Always"), askEverytime: getString("askEverytime", "Ask you every time"), prioritizeOnionsDescription: getString(

1 0

[tor-browser/tor-browser-68.9.0esr-9.5-1] fixup! Bug 21952: Implement Onion-Location
by gk＠torproject.org 11 Jun '20

11 Jun '20

commit e2d86fb3d25e5044c0b514c096b1af1a632829ab Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jun 9 14:59:00 2020 -0400 fixup! Bug 21952: Implement Onion-Location Fixes bug 34379. --- browser/modules/TorStrings.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm index 66c44257c163..05bbfd63ef60 100644 --- a/browser/modules/TorStrings.jsm +++ b/browser/modules/TorStrings.jsm @@ -434,7 +434,7 @@ var TorStrings = { tryThis: getString("tryThis", "Try this: Onionsite"), onionAvailable: getString("onionAvailable", "Onionsite available"), learnMore: getString("learnMore", "Learn more"), - learnMoreURL: `https://tb-manual.torproject.org/${getLocale()}`, // TODO: replace when manual page is available. + learnMoreURL: `https://tb-manual.torproject.org/${getLocale()}/onion-services/`, always: getString("always", "Always"), askEverytime: getString("askEverytime", "Ask you every time"), prioritizeOnionsDescription: getString(

1 0

[tor-launcher/master] Bug 33890: Rename xul files to xhtml
by gk＠torproject.org 10 Jun '20

10 Jun '20

commit de405aee1a4e5c848905b9f52bccc2764cdbb8c7 Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Apr 9 12:53:27 2020 +0200 Bug 33890: Rename xul files to xhtml --- src/chrome/content/{localePicker.xul => localePicker.xhtml} | 0 .../{network-settings-wizard.xul => network-settings-wizard.xhtml} | 0 src/chrome/content/{network-settings.xul => network-settings.xhtml} | 0 src/components/tl-process.js | 6 +++--- src/install.rdf | 3 --- 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/localePicker.xul b/src/chrome/content/localePicker.xhtml similarity index 100% rename from src/chrome/content/localePicker.xul rename to src/chrome/content/localePicker.xhtml diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xhtml similarity index 100% rename from src/chrome/content/network-settings-wizard.xul rename to src/chrome/content/network-settings-wizard.xhtml diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xhtml similarity index 100% rename from src/chrome/content/network-settings.xul rename to src/chrome/content/network-settings.xhtml diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 1cad103..31f6801 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -722,7 +722,7 @@ TorProcessService.prototype = _openLocalePicker: function() { - const kLocalePickerURL = "chrome://torlauncher/content/localePicker.xul"; + const kLocalePickerURL = "chrome://torlauncher/content/localePicker.xhtml"; var wwSvc = Cc["@mozilla.org/embedcomp/window-watcher;1"] .getService(Ci.nsIWindowWatcher); @@ -743,8 +743,8 @@ TorProcessService.prototype = return; } - const kSettingsURL = "chrome://torlauncher/content/network-settings.xul"; - const kWizardURL = "chrome://torlauncher/content/network-settings-wizard.xul"; + const kSettingsURL = "chrome://torlauncher/content/network-settings.xhtml"; + const kWizardURL = "chrome://torlauncher/content/network-settings-wizard.xhtml"; var wwSvc = Cc["@mozilla.org/embedcomp/window-watcher;1"] .getService(Ci.nsIWindowWatcher); diff --git a/src/install.rdf b/src/install.rdf index 919d5e8..571b8c5 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -12,9 +12,6 @@ <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> <em:updateKey>-</em:updateKey> -  <em:targetApplication> <Description>

1 0

[tor-launcher/master] Bug 32174: replace XUL <textbox> with <html:input>
by gk＠torproject.org 10 Jun '20

10 Jun '20

commit 32603f686e3d006d60633a52d0cf9f6cd6cdc2ef Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Apr 9 13:23:40 2020 +0200 Bug 32174: replace XUL <textbox> with <html:input> --- src/chrome/content/network-settings-shared.js | 10 +++++----- src/chrome/content/network-settings.js | 4 ++-- src/chrome/content/network-settings.xhtml | 2 +- src/chrome/skin/network-settings.css | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/chrome/content/network-settings-shared.js b/src/chrome/content/network-settings-shared.js index 1575f3d..b125d24 100644 --- a/src/chrome/content/network-settings-shared.js +++ b/src/chrome/content/network-settings-shared.js @@ -40,11 +40,11 @@ var proxySettings = ` <label value="&torsettings.useProxy.address;" control="proxyAddr" class="rightAlign"/> <hbox align="center"> - <textbox id="proxyAddr" size="20" flex="1" + <html:input id="proxyAddr" size="20" style="-moz-box-flex: 1;" placeholder="&torsettings.useProxy.address.placeholder;"/> <separator orient="vertical"/> <label value="&torsettings.useProxy.port;" control="proxyPort"/> - <textbox id="proxyPort" size="4"/> + <html:input id="proxyPort" size="4"/> </hbox> </row> <row align="center"> @@ -52,13 +52,13 @@ var proxySettings = ` value="&torsettings.useProxy.username;" control="proxyUsername" class="rightAlign"/> <hbox align="center"> - <textbox id="proxyUsername" size="14" flex="1" + <html:input id="proxyUsername" size="14" style="-moz-box-flex: 1;" placeholder="&torsettings.optional;"/> <separator orient="vertical"/> <label id="proxyPasswordLabel" value="&torsettings.useProxy.password;" control="proxyPassword"/> - <textbox id="proxyPassword" size="14" type="password" + <html:input id="proxyPassword" size="14" type="password" placeholder="&torsettings.optional;"/> </hbox> </row> @@ -175,7 +175,7 @@ var bridgeDBRequestOverlayContent = ` <hbox> <spacer id="bridgeDBReloadSpacer"/> <spacer flex="1"/> - <textbox id="bridgeDBCaptchaSolution" size="35" + <html:input id="bridgeDBCaptchaSolution" size="35" placeholder="&torsettings.useBridges.captchaSolution.placeholder;" oninput="onCaptchaSolutionChange()"/> <spacer flex="1"/> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 4b5a9af..9692b40 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -2489,7 +2489,7 @@ function setElemValue(aID, aValue) toggleElemUI(elem); break; case "html:textarea": - case "textbox": + case "html:input": if (Array.isArray(aValue)) { val = ""; @@ -2555,7 +2555,7 @@ function getElemValue(aID, aDefaultValue) rv = elem.selected; break; case "html:textarea": - case "textbox": + case "html:input": case "menulist": case "richlistbox": rv = elem.value; diff --git a/src/chrome/content/network-settings.xhtml b/src/chrome/content/network-settings.xhtml index 1d3423e..faf2dc9 100644 --- a/src/chrome/content/network-settings.xhtml +++ b/src/chrome/content/network-settings.xhtml @@ -41,7 +41,7 @@ <hbox align="center"> <label value="&torsettings.firewall.allowedPorts;" control="firewallAllowedPorts"/> - <textbox id="firewallAllowedPorts" value="80,443"/> + <html:input id="firewallAllowedPorts" value="80,443"/> </hbox> </groupbox> </vbox> diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index aae7c0b..c9452d8 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -307,7 +307,7 @@ html|textarea { .os-windows label, .os-windows description, .os-windows html|textarea, -.os-windows textbox +.os-windows html|input { font-size: 120% !important; }

1 0

[tor-launcher/master] Bug 33862: Fix usages of createTransport API
by gk＠torproject.org 10 Jun '20

10 Jun '20

commit c7b35efb2a753d1a9e2cb119c780b5679bab7ca6 Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Apr 9 13:05:27 2020 +0200 Bug 33862: Fix usages of createTransport API There was a nsISocketTransportService breaking change in https://bugzilla.mozilla.org/show_bug.cgi?id=1558726. --- src/components/tl-protocol.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index d6df319..0e8075a 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -765,7 +765,7 @@ TorProtocolService.prototype = { TorLauncherLogger.log(2, "Opening control connection to " + this.mControlHost + ":" + this.mControlPort); - socket = sts.createTransport(null, 0, this.mControlHost, + socket = sts.createTransport([], this.mControlHost, this.mControlPort, null); }

1 0

[tor-launcher/master] Bug 34206: Tor Launcher button labels are missing (Firefox 76)
by gk＠torproject.org 10 Jun '20

10 Jun '20

commit ee6c43379b23aca1efe581d9cb12642167e6a326 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed May 13 10:30:15 2020 -0400 Bug 34206: Tor Launcher button labels are missing (Firefox 76) Mozilla's wizard has a bug where localized labels are not loaded because Fluent is not initialized early enough. Apply the same workaround as Mozilla applied in https://bugzilla.mozilla.org/show_bug.cgi?id=1625938 --- src/chrome/content/localePicker.xhtml | 6 ++++++ src/chrome/content/network-settings-wizard.xhtml | 5 +++++ src/chrome/content/network-settings.js | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/localePicker.xhtml b/src/chrome/content/localePicker.xhtml index 38762a0..e31f1b2 100644 --- a/src/chrome/content/localePicker.xhtml +++ b/src/chrome/content/localePicker.xhtml @@ -12,12 +12,18 @@ <!DOCTYPE window SYSTEM "chrome://torlauncher/locale/network-settings.dtd"> <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml" torwizard="true" title="&torlauncher.localePicker.title;" windowtype="TorLauncher:LocalePicker" persist="screenX screenY" onload="initLocaleDialog();"> + +<linkset> + <html:link rel="localization" href="toolkit/global/wizard.ftl"/> +</linkset> + <wizard id="TorLauncherLocalePicker"> <script type="application/x-javascript" src="chrome://torlauncher/content/network-settings.js"/> diff --git a/src/chrome/content/network-settings-wizard.xhtml b/src/chrome/content/network-settings-wizard.xhtml index 7386067..6e26468 100644 --- a/src/chrome/content/network-settings-wizard.xhtml +++ b/src/chrome/content/network-settings-wizard.xhtml @@ -18,6 +18,11 @@ onload="initDialog();" onunload="deinitDialog();"> + +<linkset> + <html:link rel="localization" href="toolkit/global/wizard.ftl"/> +</linkset> + <wizard id="TorNetworkSettings" defaulttitle="&torsettings.wizard.title.default;" buttonlabelextra2="&torsettings.copyLog;"> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 2f89632..81d7138 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -2583,7 +2583,7 @@ function getElemValue(aID, aDefaultValue) function getButton(aButtonName) { - let dialogOrWizard = document.documentElement.firstChild; + let dialogOrWizard = document.querySelector("wizard"); return dialogOrWizard.getButton(aButtonName); }

1 0

[tor-launcher/master] Bug 33906: Fix Tor-Launcher issues for Firefox 75
by gk＠torproject.org 10 Jun '20

10 Jun '20

commit df0350fcaedf1bf859872edfead31814ef23b507 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Apr 22 15:46:23 2020 -0400 Bug 33906: Fix Tor-Launcher issues for Firefox 75 The <wizard> and <dialog> elements can no longer be used as root elements. Adapt to the use of shadow DOM within the <wizard> implemention. Migrate the locale picker from the general.useragent.locale preference to intl.locale.requested. --- src/chrome/content/localePicker.xhtml | 10 +-- src/chrome/content/network-settings-wizard.xhtml | 14 ++-- src/chrome/content/network-settings.js | 88 ++++++++++++++---------- src/chrome/content/network-settings.xhtml | 13 ++-- src/chrome/skin/network-settings.css | 25 ++----- 5 files changed, 80 insertions(+), 70 deletions(-) diff --git a/src/chrome/content/localePicker.xhtml b/src/chrome/content/localePicker.xhtml index 152b54c..38762a0 100644 --- a/src/chrome/content/localePicker.xhtml +++ b/src/chrome/content/localePicker.xhtml @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -9,15 +9,16 @@ <?xml-stylesheet href="chrome://torlauncher/skin/network-settings.css" type="text/css"?> -<!DOCTYPE wizard SYSTEM "chrome://torlauncher/locale/network-settings.dtd"> +<!DOCTYPE window SYSTEM "chrome://torlauncher/locale/network-settings.dtd"> -<wizard id="TorLauncherLocalePicker" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" +<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + torwizard="true" title="&torlauncher.localePicker.title;" windowtype="TorLauncher:LocalePicker" persist="screenX screenY" onload="initLocaleDialog();"> +<wizard id="TorLauncherLocalePicker"> <script type="application/x-javascript" src="chrome://torlauncher/content/network-settings.js"/> @@ -37,3 +38,4 @@ <label id="forAssistance"/> </hbox> </wizard> +</window> diff --git a/src/chrome/content/network-settings-wizard.xhtml b/src/chrome/content/network-settings-wizard.xhtml index 98dbdd8..7386067 100644 --- a/src/chrome/content/network-settings-wizard.xhtml +++ b/src/chrome/content/network-settings-wizard.xhtml @@ -1,5 +1,5 @@  @@ -8,18 +8,19 @@ <?xml-stylesheet href="chrome://torlauncher/skin/network-settings.css" type="text/css"?> -<!DOCTYPE wizard SYSTEM "chrome://torlauncher/locale/network-settings.dtd"> +<!DOCTYPE window SYSTEM "chrome://torlauncher/locale/network-settings.dtd"> -<wizard id="TorNetworkSettings" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" +<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" - defaulttitle="&torsettings.wizard.title.default;" + torwizard="true" windowtype="TorLauncher:NetworkSettings" persist="screenX screenY" - buttonlabelextra2="&torsettings.copyLog;" onload="initDialog();" onunload="deinitDialog();"> +<wizard id="TorNetworkSettings" + defaulttitle="&torsettings.wizard.title.default;" + buttonlabelextra2="&torsettings.copyLog;"> <script type="application/x-javascript" src="chrome://torlauncher/content/network-settings.js"/> @@ -129,3 +130,4 @@ </hbox> <panel id="copyLogFeedbackPanel"/> </wizard> +</window> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 9692b40..2f89632 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1,4 +1,4 @@ -// Copyright (c) 2019, The Tor Project, Inc. +// Copyright (c) 2020, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -20,7 +20,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherBridgeDB", "resource://torlauncher/modules/tl-bridgedb.jsm"); const kPrefPromptForLocale = "extensions.torlauncher.prompt_for_locale"; -const kPrefLocale = "general.useragent.locale"; +const kPrefLocale = "intl.locale.requested"; const kPrefMatchOSLocale = "intl.locale.matchOS"; // The recommended type is listed first in the dropdown menu. @@ -138,7 +138,7 @@ function initDialogCommon() let wizardElem = getWizard(); let haveWizard = (wizardElem != null); - let cancelBtn = document.documentElement.getButton("cancel"); + let cancelBtn = getButton("cancel"); if (cancelBtn) { gCancelLabelStr = cancelBtn.label; @@ -151,6 +151,18 @@ function initDialogCommon() if (haveWizard) { + // Apply styles to elements within the wizard element's shadow DOM. + let wizardPageBox = wizardElem.shadowRoot.querySelector(".wizard-page-box"); + if (wizardPageBox) + { + wizardPageBox.style.padding = "0px"; + wizardPageBox.style.margin = "14px 20px 18px 20px"; + } + + let wizardHeader = wizardElem.shadowRoot.querySelector(".wizard-header"); + if (wizardHeader) + wizardHeader.style.display = "none"; + // Hide the Tor Browser logo and associated separator element if the // TOR_HIDE_BROWSER_LOGO environment variable is set. let env = Cc["@mozilla.org/process/environment;1"] @@ -291,16 +303,16 @@ function initDialog() }); // Relabel the accept button to be "Connect" - let okBtn = document.documentElement.getButton("accept"); + let okBtn = getButton("accept"); if (okBtn) okBtn.label = TorLauncherUtil.getLocalizedString("connect"); // Set "Copy Tor Log" label and move it after the Quit (cancel) button. - let copyLogBtn = document.documentElement.getButton("extra2"); + let copyLogBtn = getButton("extra2"); if (copyLogBtn) { copyLogBtn.label = wizardElem.getAttribute("buttonlabelextra2"); - let cancelBtn = document.documentElement.getButton("cancel"); + let cancelBtn = getButton("cancel"); if (cancelBtn && TorLauncherUtil.isMac) cancelBtn.parentNode.insertBefore(copyLogBtn, cancelBtn.nextSibling); } @@ -312,7 +324,7 @@ function initDialog() } // Use "Connect" as the finish button label (on the last wizard page). - let finishBtn = document.documentElement.getButton("finish"); + let finishBtn = getButton("finish"); if (finishBtn) { finishBtn.label = TorLauncherUtil.getLocalizedString("connect"); @@ -320,7 +332,7 @@ function initDialog() } // Set Discard Settings back button label to match the wizard Back button. - let wizardBackBtn = document.documentElement.getButton("back"); + let wizardBackBtn = getButton("back"); let backBtn = document.getElementById("discardSettingsGoBack"); if (wizardBackBtn && backBtn) backBtn.label = wizardBackBtn.label; @@ -374,11 +386,18 @@ function initLocaleDialog() // Replace the finish button's label ("Done") with the next button's // label ("Next" or "Continue"). - let nextBtn = document.documentElement.getButton("next"); - let doneBtn = document.documentElement.getButton("finish"); + let nextBtn = getButton("next"); + let doneBtn = getButton("finish"); if (nextBtn && doneBtn) doneBtn.label = nextBtn.label; + // The locale picker does not use the "Back" and "Next" buttons; hide them. + let backBtn = getButton("back"); + if (backBtn) + backBtn.style.display = "none"; + if (nextBtn) + nextBtn.style.display = "none"; + let { AddonManager } = Cu.import("resource://gre/modules/AddonManager.jsm"); let addonsPromise = AddonManager.getAddonsByTypes(["locale"]); addonsPromise.then(aLangPackAddons => @@ -432,13 +451,9 @@ function populateLocaleList(aLangPackAddons) }; // Retrieve the current locale so we can select it within the list by default. - let curLocale; - try - { - let chromeRegSvc = Cc["@mozilla.org/chrome/chrome-registry;1"] - .getService(Ci.nsIXULChromeRegistry); - curLocale = chromeRegSvc.getSelectedLocale("global").toLowerCase(); - } catch (e) {} + let curLocale = Services.locale.requestedLocale; + if (curLocale) + curLocale = curLocale.toLowerCase(); // Build a list of language info objects (language code plus friendly name). let foundCurLocale = false; @@ -485,9 +500,9 @@ function populateLocaleList(aLangPackAddons) let localeList = document.getElementById(kLocaleList); for (let infoObj of langInfo) { - let listItem = document.createElement("richlistitem"); + let listItem = document.createXULElement("richlistitem"); listItem.setAttribute("value", infoObj.langCode); - let label = document.createElement("label"); + let label = document.createXULElement("label"); label.value = infoObj.langName; listItem.appendChild(label); localeList.appendChild(listItem); @@ -517,7 +532,7 @@ function maxWidthOfContent() for (let i = 0; i < buttons.length; ++i) showOrHideButton(buttons[i], true, false); - let btn = document.documentElement.getButton("cancel"); + let btn = getButton("cancel"); let btnContainer = btn.parentElement; const kWarningIconWidth = 20; // skin/warning.png is 16 plus some margin @@ -991,7 +1006,7 @@ function updateBootstrapProgress(aStatusObj) // visibility=hidden instead of XUL hidden=true so that the "For // Assistance" text does not move. let btnID = getWizard() ? "finish" : "cancel"; - let btn = document.documentElement.getButton(btnID); + let btn = getButton(btnID); if (btn) btn.style.visibility = "hidden"; window.setTimeout(function() { close(); }, 250); @@ -1248,7 +1263,7 @@ function isShowingErrorOverlay() function showCopyLogButton(aHaveErrorOrWarning) { - let copyLogBtn = document.documentElement.getButton("extra2"); + let copyLogBtn = getButton("extra2"); if (copyLogBtn) { let haveWizard = (getWizard() != null); @@ -1272,7 +1287,7 @@ function showCopyLogButton(aHaveErrorOrWarning) function restoreCopyLogVisibility() { - let copyLogBtn = document.documentElement.getButton("extra2"); + let copyLogBtn = getButton("extra2"); if (!copyLogBtn) return; @@ -1288,14 +1303,10 @@ function restoreCopyLogVisibility() // Network Settings window. function showOrHideDialogButtons(aShow) { - let buttonContainer = document.getAnonymousElementByAttribute( - document.documentElement, "anonid", "buttons"); - if (!buttonContainer) - { - // The wizard uses "Buttons" (capital 'B'). - buttonContainer = document.getAnonymousElementByAttribute( - document.documentElement, "anonid", "Buttons"); - } + let wizard = getWizard(); + let buttonContainer = wizard + ? wizard.shadowRoot.querySelector(".wizard-buttons") + : document.querySelector(".dialog-button-box"); if (buttonContainer) { @@ -1328,7 +1339,7 @@ function setButtonAttr(aID, aAttr, aValue) if (!aID || !aAttr) return null; - let btn = document.documentElement.getButton(aID); // dialog buttons + let btn = getButton(aID); // dialog buttons if (!btn) btn = document.getElementById(aID); // other buttons if (btn) @@ -1428,7 +1439,7 @@ function showMenuListPlaceholderText(aElemID) function overrideButtonLabel(aID, aLabel) { - let btn = document.documentElement.getButton(aID); + let btn = getButton(aID); if (btn) { btn.setAttribute("origLabel", btn.label); @@ -1446,7 +1457,7 @@ function overrideButtonLabelWithKey(aID, aLabelKey) function restoreButtonLabel(aID) { - var btn = document.documentElement.getButton(aID); + var btn = getButton(aID); if (btn) { var oldLabel = btn.getAttribute("origLabel"); @@ -1641,7 +1652,7 @@ function onCopyLog() chSvc.copyString(gProtocolSvc.TorGetLog(countObj)); // Display a feedback popup that fades away after a few seconds. - let copyLogBtn = document.documentElement.getButton("extra2"); + let copyLogBtn = getButton("extra2"); let panel = document.getElementById(kCopyLogFeedbackPanel); if (copyLogBtn && panel) { @@ -2570,6 +2581,13 @@ function getElemValue(aID, aDefaultValue) } +function getButton(aButtonName) +{ + let dialogOrWizard = document.documentElement.firstChild; + return dialogOrWizard.getButton(aButtonName); +} + + // Hide and show groupbox based on aElem's checked state. aElem may be a // checkbox or radio element. function toggleElemUI(aElem) diff --git a/src/chrome/content/network-settings.xhtml b/src/chrome/content/network-settings.xhtml index faf2dc9..9d2f6b6 100644 --- a/src/chrome/content/network-settings.xhtml +++ b/src/chrome/content/network-settings.xhtml @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -9,19 +9,19 @@ <?xml-stylesheet href="chrome://torlauncher/skin/network-settings.css" type="text/css"?> -<!DOCTYPE dialog SYSTEM "chrome://torlauncher/locale/network-settings.dtd"> +<!DOCTYPE window SYSTEM "chrome://torlauncher/locale/network-settings.dtd"> -<dialog id="TorNetworkSettings" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" +<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" title="&torsettings.dialog.title;" windowtype="TorLauncher:NetworkSettings" persist="screenX screenY" - buttons="accept,cancel,extra2" - buttonlabelextra2="&torsettings.copyLog;" onload="initDialog();" onunload="deinitDialog();"> +<dialog id="TorNetworkSettings" + buttons="accept,cancel,extra2" + buttonlabelextra2="&torsettings.copyLog;"> <script type="application/x-javascript" src="chrome://torlauncher/content/network-settings.js"/> @@ -86,3 +86,4 @@ </vbox> </stack> </dialog> +</window> diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index c9452d8..f60c5c6 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, The Tor Project, Inc. + * Copyright (c) 2020, The Tor Project, Inc. * See LICENSE for licensing information. * * vim: set sw=2 sts=2 ts=8 et syntax=css: @@ -7,36 +7,29 @@ @namespace html "http://www.w3.org/1999/xhtml"; -dialog { +window { width: 45em; height: 41em; font: -moz-dialog; } -dialog.os-windows { +window.os-windows { width: 49em; height: 42em; } -wizard { +window[torwizard="true"] { width: 45em; height: 38em; font: -moz-dialog; padding-top: 0px; } -wizard.os-windows { +window[torwizard="true"].os-windows { width: 49em; height: 44em; } -.wizard-page-box { - padding: 0px; - margin: 14px 20px 18px 20px; -} - -wizard .wizard-header { display: none; } - #forAssistance { margin-left: 12px; margin-bottom: 6px; @@ -104,11 +97,6 @@ wizard[tor_hide_browser_logo="true"] .tbb-logo { display: none; } -wizard#TorLauncherLocalePicker button[dlgtype="back"], -wizard#TorLauncherLocalePicker button[dlgtype="next"] { - display: none; -} - /* Show menulist placeholder text in gray. */ #defaultBridgeType:not([value]) .menulist-label, #defaultBridgeType[value=""] .menulist-label, @@ -124,8 +112,7 @@ wizard#TorLauncherLocalePicker button[dlgtype="next"] { margin-left: 1.8em; } -dialog.os-mac #bridgeList, -wizard.os-mac #bridgeList { +window.os-mac #bridgeList { font-size: 90%; }

1 0

[tor-launcher/master] Bug 34164: Tor Launcher deadlocks during startup (Firefox 77)
by gk＠torproject.org 10 Jun '20

10 Jun '20

commit 98f3df12d48daf277f2e3f056600c64294c628c1 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed May 13 10:45:01 2020 -0400 Bug 34164: Tor Launcher deadlocks during startup (Firefox 77) Initialize the DNS service as early as possible to avoid a problem where DNS service initialization is dispatched to the main thread while that thread is blocked. --- src/components/tl-process.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 31f6801..e9d7cde 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -100,6 +100,22 @@ TorProcessService.prototype = if ("profile-after-change" == aTopic) { + // Initialize the DNS service here (as early as possible). This + // avoids a deadlock that can occur inside TorProtocolService's + // _openAuthenticatedConnection() function. What happens in the + // deadlock case is that a Necko socket thread tries to dispatch + // initialization of the DNS service to the main thread while the + // main thread is blocked in a writeBytes() call inside the + // _sendCommand() function. The ultimate solution is to change + // our control port socket to use asynchronous I/O. + // References: + // netwerk/dns/nsDNSService2.cpp nsDNSService::GetSingleton() + // https://bugzilla.mozilla.org/show_bug.cgi?id=1625151 (the + // fix for this bug introduced the deadlock because it changed + // DNS service initialization to occur on the main thread). + const dns = Cc["@mozilla.org/network/dns-service;1"] + .getService(Ci.nsIDNSService); + this.mObsSvc.addObserver(this, "quit-application-granted", false); this.mObsSvc.addObserver(this, kOpenNetworkSettingsTopic, false); this.mObsSvc.addObserver(this, kUserQuitTopic, false);

1 0

[tor-launcher/master] Merge remote-tracking branch 'pc/bug34164-01'
by gk＠torproject.org 10 Jun '20

10 Jun '20

commit 1807842bcbb1bf2d9a72e79d5da07ee401363b68 Merge: b4838d3 98f3df1 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 10 18:43:18 2020 +0000 Merge remote-tracking branch 'pc/bug34164-01' .../{localePicker.xul => localePicker.xhtml} | 16 +++- src/chrome/content/network-settings-shared.js | 10 +-- ...gs-wizard.xul => network-settings-wizard.xhtml} | 19 +++-- src/chrome/content/network-settings.js | 92 +++++++++++++--------- ...network-settings.xul => network-settings.xhtml} | 15 ++-- src/chrome/skin/network-settings.css | 27 ++----- src/components/tl-process.js | 22 +++++- src/components/tl-protocol.js | 2 +- src/install.rdf | 3 - 9 files changed, 120 insertions(+), 86 deletions(-)

1 0

[tor-browser-build/master] Hardcode Tor Launcher commit for ESR 78 transition
by gk＠torproject.org 10 Jun '20

10 Jun '20

commit 95c2aff01a4522f5673b4048c1a29201a8a24004 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 10 18:39:31 2020 +0000 Hardcode Tor Launcher commit for ESR 78 transition In order to start landing ESR 78 related patches without breaking our nightly builds (which are still ESR 68-based) we hardcode a known good commit for now. --- projects/tor-launcher/config | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 9aaca27..f8a974a 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -22,5 +22,7 @@ steps: targets: nightly: version: '[% c("abbrev") %]' - git_hash: master + # Hardcode the commit for now so we can start landing ESR 78 patches without + # breaking nightly builds. + git_hash: b4838d339a84c5ebebd91a0ba6b22d44ecda97b1 tag_gpg_id: 0

1 0

[tor-launcher/master] Translations update
by gk＠torproject.org 10 Jun '20

10 Jun '20

commit b4838d339a84c5ebebd91a0ba6b22d44ecda97b1 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 10 18:35:20 2020 +0000 Translations update --- src/chrome/locale/cs/torlauncher.properties | 2 +- src/chrome/locale/el/network-settings.dtd | 28 ++++++++++++++-------------- src/chrome/locale/el/torlauncher.properties | 10 +++++----- src/chrome/locale/ja/torlauncher.properties | 10 +++++----- src/chrome/locale/mr/network-settings.dtd | 4 ++-- src/chrome/locale/ta/network-settings.dtd | 8 ++++---- src/chrome/locale/ta/torlauncher.properties | 2 +- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/chrome/locale/cs/torlauncher.properties b/src/chrome/locale/cs/torlauncher.properties index 0fb961d..27e5743 100644 --- a/src/chrome/locale/cs/torlauncher.properties +++ b/src/chrome/locale/cs/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=Tor není možné zapnout\n\n%S torlauncher.tor_missing=Spustitelný soubor Toru chybí. torlauncher.torrc_missing=Chybí soubor torrc a nemohl být vytvořen. torlauncher.datadir_missing=Složka s daty Toru neexistuje a nemohla být vytvořena. -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. +torlauncher.onionauthdir_missing=Onion ověřovací složka Toru neexistuje a nemohla být vytvořena. torlauncher.password_hash_missing=Nepovedlo se získat hashované heslo. torlauncher.failed_to_get_settings=Nelze načíst nastavení Toru.\n\n%S diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd index 9af2805..e094209 100644 --- a/src/chrome/locale/el/network-settings.dtd +++ b/src/chrome/locale/el/network-settings.dtd @@ -26,7 +26,7 @@ <!ENTITY torsettings.optional "Προεραιτικα"> <!ENTITY torsettings.useProxy.checkbox "Χρησιμοποιώ διακομιστή μεσολάβησης για να συνδεθώ στο ίντερνετ."> -<!ENTITY torsettings.useProxy.type "Proxy Type"> +<!ENTITY torsettings.useProxy.type "Τύπος διακομιστή μεσολάβησης"> <!ENTITY torsettings.useProxy.type.placeholder "Επιλέξτε τύπο διακομιστή μεσολάβησης."> <!ENTITY torsettings.useProxy.address "Διεύθυνση"> <!ENTITY torsettings.useProxy.address.placeholder "Διεύθυνση ΙΡ η όνομα υπολογιστή "> @@ -37,7 +37,7 @@ <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Το τείχος προστασίας μου με αφήνει να συνδέομαι μόνο σε συγκεκριμένες θύρες συστήματος"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "Επιτρεπόμενες Θύρες"> <!ENTITY torsettings.useBridges.checkbox "Ο Tor είναι αποκλεισμένος στη χώρα μου"> <!ENTITY torsettings.useBridges.default "Επιλέξτε ένα ενταγμένο bridge"> <!ENTITY torsettings.useBridges.default.placeholder "Επιλέξτε ένα bridge"> @@ -63,21 +63,21 @@  <!ENTITY torPreferences.categoryTitle "Tor"> -<!ENTITY torPreferences.torSettings "Tor Settings"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > +<!ENTITY torPreferences.torSettings "Ρυθμίσεις Tor"> +<!ENTITY torPreferences.torSettingsDescription "Ο Tor Browser δρομολογεί την κίνηση δικτύου σας μέσα από το δίκτυο Tor, που λειτουργεί χάρη σε χιλιάδες εθελοντές σε όλο τον κόσμο." > <!ENTITY torPreferences.learnMore "Μάθετε περισσότερα"> <!ENTITY torPreferences.bridges "Γέφυρες"> -<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> -<!ENTITY torPreferences.useBridge "Use a bridge"> +<!ENTITY torPreferences.bridgesDescription "Οι γέφυρες σας βοηθούν στην πρόσβαση στο δίκτυο Tor σε τοποθεσίες που δεν επιτρέπεται. Εξαρτάται που βρίσκεστε, κάποια γέφυρα μπορεί να λειτουργεί από άλλες."> +<!ENTITY torPreferences.useBridge "Χρήση γέφυρας"> <!ENTITY torPreferences.requestNewBridge "Ζητήστε μία καινούρια γέφυρα..."> -<!ENTITY torPreferences.provideBridge "Provide a bridge"> +<!ENTITY torPreferences.provideBridge "Παραχωρήστε μια γέφυρα"> <!ENTITY torPreferences.advanced "Ρυθμίσεις για προχωρημένους"> -<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> -<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> -<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> +<!ENTITY torPreferences.advancedDescription "Ρυθμίστε τον τρόπο που συνδέεται ο Tor Browser στο διαδίκτυο."> +<!ENTITY torPreferences.firewallPortsPlaceholder "Τιμές διαχωρισμένες με κόμμα"> +<!ENTITY torPreferences.requestBridgeDialogTitle "Αίτηση γέφυρας..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Επικοινωνία με την BridgeDB. Παρακαλώ, περιμένετε."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Λύστε το CAPTCHA για να ζητήσετε γέφυρα."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "Η λύση δεν είναι σωστή. Παρακαλώ προσπαθήστε ξανά."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> +<!ENTITY torPreferences.viewTorLogs "Προβολή αρχείων καταγραφής του Tor."> +<!ENTITY torPreferences.viewLogs "Προβολή αρχείων καταγραφής..."> +<!ENTITY torPreferences.torLogsDialogTitle "Αρχεία καταγραφών Tor"> diff --git a/src/chrome/locale/el/torlauncher.properties b/src/chrome/locale/el/torlauncher.properties index 980ac56..dc250a4 100644 --- a/src/chrome/locale/el/torlauncher.properties +++ b/src/chrome/locale/el/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=Αδυναμία εκκίνησης του Tor. torlauncher.tor_missing=Το Tor εκτελέσιμο λείπει. torlauncher.torrc_missing=Το αρχείο torrc λείπει και δεν μπορεί να δημιουργηθεί. torlauncher.datadir_missing=Ο κατάλογος δεδομένων Tor δεν υπάρχει και δεν μπορεί να δημιουργηθεί. -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. +torlauncher.onionauthdir_missing=Ο κατάλογος αυθεντικοποίησης Tor onion δεν υπάρχει και δεν μπορεί να δημιουργηθεί. torlauncher.password_hash_missing=Απέτυχε να πάρει διαγραμμισμένο κωδικό πρόσβασης. torlauncher.failed_to_get_settings=Αποτυχία διαγραφής των Tor ρυθμισεων.⏎\n⏎\n%S @@ -60,8 +60,8 @@ torlauncher.bootstrapStatus.conn_proxy=Συνδέεται στο διαμεσο torlauncher.bootstrapStatus.conn_done_proxy=Συνδέθηκε στο διαμεσολαβητή torlauncher.bootstrapStatus.conn=Συνδέεται σε αναμεταδότη Tor torlauncher.bootstrapStatus.conn_done=Συνδέθηκε σε αναμεταδότη Tor -torlauncher.bootstrapStatus.handshake=Negotiating with a Tor relay -torlauncher.bootstrapStatus.handshake_done=Finished negotiating with a Tor relay +torlauncher.bootstrapStatus.handshake=Διαπραγμάτευση με αναμεταδότη Tor +torlauncher.bootstrapStatus.handshake_done=Ολοκλήρωση διαπραγμάτευσης με αναμεταδότη Tor torlauncher.bootstrapStatus.onehop_create=Πραγματοποιήθηκε σύνδεση σε κρυπτογραφημένο κατάλογο torlauncher.bootstrapStatus.requesting_status=Ανάκτηση της κατάστασης του δικτύου torlauncher.bootstrapStatus.loading_status=Φόρτωση της κατάστασης του δικτύου @@ -75,8 +75,8 @@ torlauncher.bootstrapStatus.ap_conn_proxy=Κτίσιμο κυκλωμάτων: torlauncher.bootstrapStatus.ap_conn_done_proxy=Κτίσιμο κυκλωμάτων: Συνδέθηκε με τον διαμεσολαβητή torlauncher.bootstrapStatus.ap_conn=Κτίσιμο κυκλωμάτων: Συνδέεται με έναν ενδιάμεσο κόμβο Tor torlauncher.bootstrapStatus.ap_conn_done=Κτίσιμο κυκλωμάτων: Συνδέθηκε με έναν ενδιάμεσο κόμβο Tor -torlauncher.bootstrapStatus.ap_handshake=Building circuits: Negotiating with a Tor relay -torlauncher.bootstrapStatus.ap_handshake_done=Building circuits: Finished negotiating with a Tor relay +torlauncher.bootstrapStatus.ap_handshake=Δημιουργία κυκλώματος: Διαπραγμάτευση με αναμεταδότη Tor +torlauncher.bootstrapStatus.ap_handshake_done=Δημιουργία κυκλώματος: Ολοκλήρωση διαπραγμάτευσης με αναμεταδότη Tor torlauncher.bootstrapStatus.circuit_create=Κτίσιμο κυκλωμάτων: Δημιουργία ενός κυκλώματος Tor torlauncher.bootstrapStatus.done=Συνδεθήκατε στο δίκτυο Tor! diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties index f233fc2..3be4b94 100644 --- a/src/chrome/locale/ja/torlauncher.properties +++ b/src/chrome/locale/ja/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=Torを開始出来ません。\n\n%S torlauncher.tor_missing=Torの実行可能ファイルが見つかりません。 torlauncher.torrc_missing=torrcファイルが見つからず、作成もできませんでした。 torlauncher.datadir_missing=Torのデータディレクトリが存在せず、作成もできませんでした。 -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. +torlauncher.onionauthdir_missing=Tor Onion 認証ディレクトリが存在せず、また作成することもできませんでした。 torlauncher.password_hash_missing=ハッシュ化されたパスワードの入手に失敗しました torlauncher.failed_to_get_settings=Torの設定を回復出来ません。\n\n%S @@ -73,10 +73,10 @@ torlauncher.bootstrapStatus.ap_conn_pt=サーキットを確立中：ブリッ torlauncher.bootstrapStatus.ap_conn_done_pt=サーキットを確立中：ブリッジと接続しました torlauncher.bootstrapStatus.ap_conn_proxy=サーキットを確立中：プロキシと接続中 torlauncher.bootstrapStatus.ap_conn_done_proxy=サーキットを確立中：プロキシと接続しました -torlauncher.bootstrapStatus.ap_conn=サーキットを確立中：Torリレーと接続中 -torlauncher.bootstrapStatus.ap_conn_done=サーキットを確立中：Torリレーと接続しました -torlauncher.bootstrapStatus.ap_handshake=サーキットを確立中：Torリレーとネゴシエート中 -torlauncher.bootstrapStatus.ap_handshake_done=サーキットを確立中：Torリレーとネゴシエート完了しました +torlauncher.bootstrapStatus.ap_conn=サーキットを確立中：Tor リレーと接続中 +torlauncher.bootstrapStatus.ap_conn_done=サーキットを確立中：Tor リレーと接続しました +torlauncher.bootstrapStatus.ap_handshake=サーキットを確立中：Tor リレーとネゴシエート中 +torlauncher.bootstrapStatus.ap_handshake_done=サーキットを確立中：Tor リレーとネゴシエート完了しました torlauncher.bootstrapStatus.circuit_create=サーキットを確立中：Tor サーキットを設置しています torlauncher.bootstrapStatus.done=Tor ネットワークに接続しました! diff --git a/src/chrome/locale/mr/network-settings.dtd b/src/chrome/locale/mr/network-settings.dtd index b7ffd2d..03f09a6 100644 --- a/src/chrome/locale/mr/network-settings.dtd +++ b/src/chrome/locale/mr/network-settings.dtd @@ -32,7 +32,7 @@ <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "पोर्ट"> <!ENTITY torsettings.useProxy.username "Username"> -<!ENTITY torsettings.useProxy.password "Password"> +<!ENTITY torsettings.useProxy.password "पासवर्ड "> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> @@ -66,7 +66,7 @@ <!ENTITY torPreferences.torSettings "Tor Settings"> <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > <!ENTITY torPreferences.learnMore "Learn More"> -<!ENTITY torPreferences.bridges "Bridges"> +<!ENTITY torPreferences.bridges "पूल "> <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> <!ENTITY torPreferences.useBridge "Use a bridge"> <!ENTITY torPreferences.requestNewBridge "नवीन ब्रिजची विनंती करा ..."> diff --git a/src/chrome/locale/ta/network-settings.dtd b/src/chrome/locale/ta/network-settings.dtd index 529f134..671734a 100644 --- a/src/chrome/locale/ta/network-settings.dtd +++ b/src/chrome/locale/ta/network-settings.dtd @@ -78,7 +78,7 @@ <!ENTITY torPreferences.requestBridgeDialogTitle "Bridge ஐ வேண்டுக"> <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> -<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "உள்ளிட்ட தீர்வு சரியானதல்ல. தயவு செய்து மீண்டும் முயல்க"> +<!ENTITY torPreferences.viewTorLogs "Tor பதிகைகளைக் காண்க"> +<!ENTITY torPreferences.viewLogs "பதிகைகளைக் காண்க..."> +<!ENTITY torPreferences.torLogsDialogTitle "Tor பதிகைகள்"> diff --git a/src/chrome/locale/ta/torlauncher.properties b/src/chrome/locale/ta/torlauncher.properties index b9a7c29..6c5bdaa 100644 --- a/src/chrome/locale/ta/torlauncher.properties +++ b/src/chrome/locale/ta/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.request_a_bridge=Request a Bridge… torlauncher.request_a_new_bridge=புதிய Bridge ஐ வேண்டுக... torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. +torlauncher.bad_captcha_solution=உள்ளிட்ட தீர்வு சரியானதல்ல. தயவு செய்து மீண்டும் முயல்க torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. torlauncher.no_bridges_available=No bridges are available at this time. Sorry.

1 0

[tor-browser-build/master] Add #27903 to alpha Changelog, too
by gk＠torproject.org 08 Jun '20

08 Jun '20

commit b76fb9960da268cc6ad676241ea0d25706936175 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 8 17:35:56 2020 +0000 Add #27903 to alpha Changelog, too --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index aa55f4f..c045d53 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -296,6 +296,8 @@ Tor Browser 9.5a5 -- February 12 2020 * Bug 32870: Update version of pion-webrtc * Bug 32767: Remove Disconnect search * Bug 30237: Add v3 onion services client authentication prompt + * Linux + * Bug 27903: Tor Browser 8 does not respect gtk3 settings * Android * Bug 30767: Custom obfs4 bridge does not work on Tor Browser for Android * Build System

1 0

[tor-browser-build/master] Changelog fixup
by gk＠torproject.org 06 Jun '20

06 Jun '20

commit 2c84d8d13c7313f88db9418aab0d4ff65c6610d6 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 6 08:01:02 2020 +0000 Changelog fixup --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 534c207..aa55f4f 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -95,7 +95,7 @@ Tor Browser 9.5 -- June 2 2020 * Bug 33931: obfs4 bridges are used instead of meek if meek is selected in Tor Browser for Android alpha * Build System * All Platforms - * Go to 1.13.11 + * Bump Go to 1.13.11 * Bug 33380: Add *.json to sha256sums-unsigned-build.txt * Windows * Bug 33802: --enable-secure-api is not supported anymore in mingw-w64

1 0

[tor-browser-spec/master] Remove old removal instruction
by gk＠torproject.org 03 Jun '20

03 Jun '20

commit 68ed1e671bad403ec2ff911421febe46fe3e557f Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 3 12:14:23 2020 +0000 Remove old removal instruction --- processes/ReleaseProcess | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index 76a29e4..1c2076e 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -121,6 +121,7 @@ #. Transfer builds to staticiforme # IMPORTANT: Remove the oldest version in a series in case there is more # than 1 available on dist.torproject.org before proceeding + # XXX: TORBROWSER_VERSION_OLDEST needs to be set rm -rf /srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION_OLDEST static-update-component dist.torproject.org # We must use $TORBROWSER_VERSION here because signed result dirs should omit the build number suffix @@ -212,10 +213,6 @@ torsocks rsync -avP $TORBROWSER_UPDATE_CHANNEL staticiforme.torproject.org:/srv/aus1-master.torproject.org/htdocs/torbrows… torsocks ssh staticiforme.torproject.org "chown -R :torwww /srv/aus1-master.torproject.org/htdocs/torbrowser/update_3/${TORBROWSER_UPDATE_CHANNEL}/*" torsocks ssh staticiforme.torproject.org "static-update-component aus1.torproject.org" - # Finally, remove old version as we point the update channel at the new version. - # XXX: CAREFUL! $OLD_TOR_BROWSER_VERSION must be set! - torsocks ssh staticiforme.torproject.org "rm -rf /srv/dist-master.torproject.org/htdocs/torbrowser/$OLD_TORBROWSER_VERSION" - torsocks ssh staticiforme.torproject.org "static-update-component dist.torproject.org" #. Write an email to tor-announce in case this release is concerned with getting # a stable version out. Using the contents of the blog entry should do it.

1 0

[tor-browser-spec/master] Remove oldest Tor Browser before adding new version
by gk＠torproject.org 03 Jun '20

03 Jun '20

commit 7757b479c597a77ce110975b62fa341081cecfbc Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 3 09:29:04 2020 +0000 Remove oldest Tor Browser before adding new version --- processes/ReleaseProcess | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index 842325c..76a29e4 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -119,6 +119,10 @@ torsocks ssh people.torproject.org "mv public_html/$TORBROWSER_BUILDDIR public_html/$TORBROWSER_VERSION" #. Transfer builds to staticiforme + # IMPORTANT: Remove the oldest version in a series in case there is more + # than 1 available on dist.torproject.org before proceeding + rm -rf /srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION_OLDEST + static-update-component dist.torproject.org # We must use $TORBROWSER_VERSION here because signed result dirs should omit the build number suffix wget -nH --cut-dirs=2 -r -l 1 https://people.torproject.org/~gk/builds/$TORBROWSER_VERSION rm $TORBROWSER_VERSION/index.html*

1 0

[tor-browser-build/master] Fold in 9.5 Changelog
by gk＠torproject.org 03 Jun '20

03 Jun '20

commit 03681a71e132ddded0c25cd6a7f381d6bcfcccfa Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 3 09:14:13 2020 +0000 Fold in 9.5 Changelog --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 89 ++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index dfaee83..534c207 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -21,6 +21,95 @@ Tor Browser 10.0a1 -- June 2 2020 * Android * Bug 28672: Android reproducible build of Snowflake +Tor Browser 9.5 -- June 2 2020 + * All Platforms + * Update Firefox to 68.9.0esr + * Update HTTPS-Everywhere to 2020.5.20 + * Update NoScript to 11.0.26 + * Update Tor to 0.4.3.5 + * Translations update + * Bug 21549: Disable wasm for now until it is properly audited + * Bug 27268: Preferences clean-up in Torbutton code + * Bug 28745: Remove torbutton.js unused code + * Bug 28746: Remove torbutton isolation and fp prefs sync + * Bug 30237: Control port module improvements for v3 client authentication + * Bug 30786: Add th locale + * Bug 30787: Add lt locale + * Bug 30788: Add ms locale + * Bug 30851: Move default preferences to 000-tor-browser.js + * Bug 30888: move torbutton_util.js to modules/utils.js + * Bug 31134: Govern graphite again by security settings + * Bug 31395: Remove inline script in aboutTor.xhtml + * Bug 31499: Update libevent to 2.1.11-stable + * Bug 33877: Disable Samples and Regression tests For Libevent Build + * Bug 31573: Catch SessionStore.jsm exception + * Bug 32318: Backport Mozilla's fix for bug 1534339 + * Bug 32414: Make Services.search.addEngine obey FPI + * Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT + * Bug 32618: Backport fixes from Mozilla bugs 1467970 and 1590526 + * Bug 33342: Avoid disconnect search addon error after removal + * Bug 33726: Fix patch for #23247: Communicating security expectations for .onion + * Bug 34157: Backport fix for Mozilla Bug 1511941 + * Windows + OS X + Linux + * Update Tor Launcher to 0.2.21.8 + * Translations update + * Bug 19757: Support on-disk storage of v3 client auth keys + * Bug 30237: Add v3 onion services client authentication prompt + * Bug 30786: Add th locale + * Bug 30787: Add lt locale + * Bug 30788: Add ms locale + * Bug 33514: non-en-US Tor Browser 9.5a6 won't start up + * Bug 19251: Show improved error pages for onion service errors + * Bug 19757: Support on-disk storage of v3 client auth keys + * Bug 21952: Implement Onion-Location + * Bug 27604: Fix broken Tor Browser after moving it to a different directory + * Bug 28005: Implement .onion alias urlbar rewrites + * Bug 30237: Improve TBB UI of hidden service client authorization + * Bug 32076: Upgrade to goptlib v1.1.0 + * Bug 32220: Improve the letterboxing experience + * Bug 32418: Allow updates to be disabled via an enterprise policy. + * Bug 32470: Backport fix for bug 1590538 + * Bug 32645: Update URL bar onion indicators + * Bug 32658: Create a new MAR signing key + * Bug 32674: Point the about:tor "Get involved" link to the community portal + * Bug 32767: Remove Disconnect search + * Bug 33698: Update "About Tor Browser" links in Tor Browser + * Bug 33707: Swap out onion icon in circuit display with new one + * Bug 34032: Use Securedrop's Official https-everywhere ruleset + * Bug 34196: Update site info URL with the onion name + * Bug 34321: Add Learn More onboarding item + * Windows + * Bug 22919: Improve the random number generator for the boundaries in multipart/form-data + * Bug 29614: Use SHA-256 algorithm for Windows timestamping + * Bug 33113: Bump NSIS version to 3.05 + * OS X + * Bug 32505: Tighten our rules in our entitlements file for macOS + * Linux + * Bug 27903: Tor Browser 8 does not respect gtk3 settings + * Bug 34315: Avoid reading policies from /etc/firefox on Linux + * Android + * Bug 26529: Notify user about possible proxy-bypass before opening external app + * Bug 30767: Custom obfs4 bridge does not work on Tor Browser for Android + * Bug 32303: Obfs4 is broken on Android Q + * Bug 33359: Use latest Version of TOPL and Remove Patches + * Bug 33931: obfs4 bridges are used instead of meek if meek is selected in Tor Browser for Android alpha + * Build System + * All Platforms + * Go to 1.13.11 + * Bug 33380: Add *.json to sha256sums-unsigned-build.txt + * Windows + * Bug 33802: --enable-secure-api is not supported anymore in mingw-w64 + * Linux + * Bug 32976: Build and bundle geckodriver + * Bug 34242: Fix creation of Linux containers + * Android + * Bug 28765: LibEvent Build for Android + * Bug 28766: Tor Build for Android + * Bug 28803: Integrate building Pluggable Transports for Android + * Bug 30461: Clean up tor-android-service project + * Bug 32993: Package Tor With Tor Android Service Project + * Bug 33685: Add Support for Building zlib for Android + Tor Browser 9.5a13 -- May 20 2020 * All Platforms * Bump NoScript to 11.0.26

1 0

[tor-browser-build/maint-9.5] Add Bug 27903 in ChangeLog
by sysrqb＠torproject.org 02 Jun '20

02 Jun '20

commit a16bf4af86d3c2e5484001b8a22f4b83c3916389 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Jun 2 22:25:59 2020 +0000 Add Bug 27903 in ChangeLog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 85fbe43..3439afa 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -62,6 +62,7 @@ Tor Browser 9.5 -- June 2 2020 * OS X * Bug 32505: Tighten our rules in our entitlements file for macOS * Linux + * Bug 27903: Tor Browser 8 does not respect gtk3 settings * Bug 34315: Avoid reading policies from /etc/firefox on Linux * Android * Bug 26529: Notify user about possible proxy-bypass before opening external app

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_33864'
by gk＠torproject.org 01 Jun '20

01 Jun '20

commit dead06d60f62a8042fbf8a1d67a7f7835b7d5fce Merge: 07df060 efe9341 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 1 06:48:50 2020 +0000 Merge remote-tracking branch 'boklm/bug_33864' tools/ansible/roles/tbb-nightly-build/defaults/main.yml | 2 ++ tools/ansible/roles/tbb-nightly-build/tasks/main.yml | 8 ++++++++ tools/ansible/roles/tbb-nightly-build/templates/nginx.conf | 4 ++++ .../templates/tbb-nightly-build.auth_basic_user_file | 1 + 4 files changed, 15 insertions(+)

1 0

[tor-browser-build/master] Bug 33864: Add auth_basic to nightly build web server
by gk＠torproject.org 01 Jun '20

01 Jun '20

commit efe93411c75b8f2c0ba80164b9af7ab914614b9f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 9 21:26:56 2020 +0200 Bug 33864: Add auth_basic to nightly build web server --- tools/ansible/roles/tbb-nightly-build/defaults/main.yml | 2 ++ tools/ansible/roles/tbb-nightly-build/tasks/main.yml | 8 ++++++++ tools/ansible/roles/tbb-nightly-build/templates/nginx.conf | 4 ++++ .../templates/tbb-nightly-build.auth_basic_user_file | 1 + 4 files changed, 15 insertions(+) diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml index 0a9e94a..55154d3 100644 --- a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml +++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml @@ -9,3 +9,5 @@ testsuite_git_commit: ea0942f9da2bdbaf3f140f3baaed1bb56ee9af69 nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www" nightly_build_nginx_enable: true nightly_build_nginx_listen: 127.0.0.1:80 +nightly_build_nginx_auth_basic_enable: true +nightly_build_nginx_auth_basic_content: tor-guest:ezmjAG/jVTat. diff --git a/tools/ansible/roles/tbb-nightly-build/tasks/main.yml b/tools/ansible/roles/tbb-nightly-build/tasks/main.yml index 2c795b8..d5254b6 100644 --- a/tools/ansible/roles/tbb-nightly-build/tasks/main.yml +++ b/tools/ansible/roles/tbb-nightly-build/tasks/main.yml @@ -75,6 +75,14 @@ mode: 0644 owner: "{{ nightly_build_user }}" +- name: create tbb-nightly-build.auth_basic_user_file + template: + src: tbb-nightly-build.auth_basic_user_file + dest: /etc/nginx/tbb-nightly-build.auth_basic_user_file + mode: 0644 + owner: root + when: nightly_build_nginx_auth_basic_enable + - name: install nginx apt: name: nginx diff --git a/tools/ansible/roles/tbb-nightly-build/templates/nginx.conf b/tools/ansible/roles/tbb-nightly-build/templates/nginx.conf index 9d44bec..62ca8e3 100644 --- a/tools/ansible/roles/tbb-nightly-build/templates/nginx.conf +++ b/tools/ansible/roles/tbb-nightly-build/templates/nginx.conf @@ -12,5 +12,9 @@ server { location /tor-browser-builds { alias {{ testsuite_dir }}/tor-browser-builds; autoindex on; + {% if nightly_build_nginx_auth_basic_enable %} + auth_basic "Use tor-guest as username and password"; + auth_basic_user_file /etc/nginx/tbb-nightly-build.auth_basic_user_file; + {% endif %} } } diff --git a/tools/ansible/roles/tbb-nightly-build/templates/tbb-nightly-build.auth_basic_user_file b/tools/ansible/roles/tbb-nightly-build/templates/tbb-nightly-build.auth_basic_user_file new file mode 100644 index 0000000..45d673c --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/tbb-nightly-build.auth_basic_user_file @@ -0,0 +1 @@ +{{ nightly_build_nginx_auth_basic_content }}

1 0

[tor-browser-build/master] Let's mention bug 34347 explicitly in the Changelog
by gk＠torproject.org 30 May '20

30 May '20

commit 07df06075ea473346683b639c4f2703cac04d941 Author: Georg Koppen <gk(a)torproject.org> Date: Sat May 30 05:38:09 2020 +0000 Let's mention bug 34347 explicitly in the Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index a4e261c..dfaee83 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -7,6 +7,7 @@ Tor Browser 10.0a1 -- June 2 2020 * Update Tor Launcher to 0.2.21.8 * Translations update * Bug 34321: Add Learn More onboarding item + * Bug 34347: The Tor Network part on the onboarding is not new anymore * Linux * Bug 34315: Avoid reading policies from /etc/firefox on Linux * Android

1 0

[tor-browser-build/master] Release preparations for 10.0a1
by sysrqb＠torproject.org 29 May '20

29 May '20

commit db927811143f4f124f24b435adf477f19fa306c2 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 21:25:47 2020 +0000 Release preparations for 10.0a1 Versions bump and Changelog update. --- projects/firefox-langpacks/config | 2 +- projects/firefox-locale-bundle/config | 2 +- projects/firefox/config | 6 +++--- projects/https-everywhere/config | 2 +- projects/tba-translation/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 22 ++++++++++++++++++++++ projects/tor-launcher/config | 2 +- rbm.conf | 6 +++--- 8 files changed, 33 insertions(+), 11 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 17a707a..34d6fad 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets: diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config index 2ea6db6..2f4997f 100644 --- a/projects/firefox-locale-bundle/config +++ b/projects/firefox-locale-bundle/config @@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: use_container: 0 ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 diff --git a/projects/firefox/config b/projects/firefox/config index 272634d..a64763e 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,16 +1,16 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.8.0 + firefox_platform_version: 68.9.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' - torbrowser_branch: 9.5 + torbrowser_branch: 10.0 branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 7e5aa51..a5be759 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2020.3.16 +version: 2020.5.20 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tba-translation/config b/projects/tba-translation/config index 29388a4..ab5c04e 100644 --- a/projects/tba-translation/config +++ b/projects/tba-translation/config @@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/translation.git # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. -git_hash: d3df6cc6e1797733ebca5b370f0f6915f490666f +git_hash: d5bd416ac0cda30893e18f2eb511514bd2e698bd version: '[% c("abbrev") %]' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index ab1c7b8..a4e261c 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,25 @@ +Tor Browser 10.0a1 -- June 2 2020 + * All Platforms + * Update Firefox to 68.9.0esr + * Update HTTPS-Everywhere to 2020.5.20 + * Translations update + * Windows + OS X + Linux + * Update Tor Launcher to 0.2.21.8 + * Translations update + * Bug 34321: Add Learn More onboarding item + * Linux + * Bug 34315: Avoid reading policies from /etc/firefox on Linux + * Android + * Bug 30318: Integrate snowflake into mobile Tor Browser + * Bug 34219: Enable ZSTD support properly for Android + * Build System + * Windows + * Bug 31128: Move Windows containers to Debian 10 + * Mac OS X + * Bug 31129: Move macOS containers to Debian 10 + * Android + * Bug 28672: Android reproducible build of Snowflake + Tor Browser 9.5a13 -- May 20 2020 * All Platforms * Bump NoScript to 11.0.26 diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index eb4dc24..9aaca27 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.21.7 +version: 0.2.21.8 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index f2d0f4f..d0afe9a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.5a13' - torbrowser_build: 'build2' + torbrowser_version: '10.0a1' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.5a12 + - 9.5a13 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] fixup! Pick up latest Torbutton code
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 104e4dd98059f0f42bc78929aea4cce0b999d996 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 21:18:49 2020 +0000 fixup! Pick up latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 83bc9c956c3b..0b6562dfffd0 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 83bc9c956c3be091c421521fcf05c3cdc393e870 +Subproject commit 0b6562dfffd0e032ea0051a8c09069fba37d4838

1 0

[tor-browser-build/master] Bug 30318 - Integrate snowflake on Android
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 4d57755506496d02107e4dc2adf38252032df383 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 20:26:19 2020 +0000 Bug 30318 - Integrate snowflake on Android --- projects/tor-android-service/config | 2 +- .../0001-Bug-30318-Add-snowflake-support.patch | 90 ++++++++++++++++++++++ projects/tor-onion-proxy-library/build | 1 + projects/tor-onion-proxy-library/config | 1 + 4 files changed, 93 insertions(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 800fc47..7ab3ca7 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: ed2e1479eeddede01b1d510ef79dc5ec798b39c0 +git_hash: ecc251d0a73f7e2034a271efd28036a0108b8688 git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1 diff --git a/projects/tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch b/projects/tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch new file mode 100644 index 0000000..03e06aa --- /dev/null +++ b/projects/tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch @@ -0,0 +1,90 @@ +From e006e215b274b1b834e098b199ea2697bc11b0f1 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Sun, 10 May 2020 08:29:10 +0000 +Subject: [PATCH] Bug 30318: Add snowflake support + + +diff --git a/android/build.gradle b/android/build.gradle +index a8d9bdc..2392731 100644 +--- a/android/build.gradle ++++ b/android/build.gradle +@@ -93,6 +93,9 @@ task copyPluggableTransports(type: Copy) { + rename { filename -> + filename.replace 'obfs4proxy', 'libObfs4proxy.so' + } ++ rename { filename -> ++ filename.replace 'snowflake-client', 'libSnowflake.so' ++ } + } + + gradle.projectsEvaluated { +diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +index 2405097..bcb6a37 100644 +--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java ++++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +@@ -109,22 +109,33 @@ public final class TorConfigBuilder { + return this; + } + +- public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportClient) throws IOException { +- if (pluggableTransportClient == null) { ++ public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportObfs, File pluggableTransportSnow) throws IOException { ++ if (pluggableTransportObfs == null || pluggableTransportSnow == null) { + return this; + } + +- if (!pluggableTransportClient.exists()) { +- throw new IOException("Bridge binary does not exist: " + pluggableTransportClient ++ if (!pluggableTransportObfs.exists()) { ++ throw new IOException("Obfs4proxy binary does not exist: " + pluggableTransportObfs + .getCanonicalPath()); + } + +- if (!pluggableTransportClient.canExecute()) { +- throw new IOException("Bridge binary is not executable: " + pluggableTransportClient ++ if (!pluggableTransportSnow.exists()) { ++ throw new IOException("Snowflake binary does not exist: " + pluggableTransportSnow + .getCanonicalPath()); + } + +- transportPlugin(pluggableTransportClient.getCanonicalPath()); ++ if (!pluggableTransportObfs.canExecute()) { ++ throw new IOException("Obfs4proxy binary is not executable: " + pluggableTransportObfs ++ .getCanonicalPath()); ++ } ++ ++ if (!pluggableTransportSnow.canExecute()) { ++ throw new IOException("Snowflake binary is not executable: " + pluggableTransportSnow ++ .getCanonicalPath()); ++ } ++ ++ ++ transportPlugin(pluggableTransportObfs.getCanonicalPath(), pluggableTransportSnow.getCanonicalPath()); + return this; + } + +@@ -491,8 +502,9 @@ public final class TorConfigBuilder { + return transPort(settings.transPort()); + } + +- public TorConfigBuilder transportPlugin(String clientPath) { +- buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(clientPath).append('\n'); ++ public TorConfigBuilder transportPlugin(String obfsPath, String snowPath) { ++ buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(obfsPath).append('\n'); ++ buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append(" -url https://snowflake-broker.azureedge.net/ -front ajax.aspnetcdn.com -ice stun:stun.l.google.com:19302\n"); + return this; + } + +@@ -557,6 +569,9 @@ public final class TorConfigBuilder { + case 3: + reqBridgeType = "meek_lite"; + break; ++ case 4: ++ reqBridgeType = "snowflake"; ++ break; + default: + throw new IOException("Requested unknown transport type: " + bridgesType); + } +-- +2.26.2 + diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index dfe1837..937c72f 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -22,6 +22,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] patch -p1 < $rootdir/gradle.patch patch -p1 < $rootdir/0001-Bug-33931-Filter-bridges-in-stream-by-type.patch +patch -p1 < $rootdir/0001-Bug-30318-Add-snowflake-support.patch # Extract obfs4proxy from TorBrowser/Tor/PluggableTransports/obfs4proxy tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/obfs4') %] diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index cffcdd0..98bb93c 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -28,3 +28,4 @@ input_files: exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - filename: gradle.patch - filename: 0001-Bug-33931-Filter-bridges-in-stream-by-type.patch + - filename: 0001-Bug-30318-Add-snowflake-support.patch

1 0

[tor-browser-build/master] Bug 28672: Android reproducible build of Snowflake
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 853e75e9276432a39153db2e3fa54375af9b8822 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Apr 30 13:46:56 2020 +0000 Bug 28672: Android reproducible build of Snowflake --- projects/snowflake/build | 7 +++++++ projects/snowflake/config | 3 +++ projects/tor-browser/config | 2 +- projects/tor-onion-proxy-library/build | 7 ++++++- projects/tor-onion-proxy-library/config | 2 ++ rbm.conf | 3 +++ 6 files changed, 22 insertions(+), 2 deletions(-) diff --git a/projects/snowflake/build b/projects/snowflake/build index 2724dd9..a72caba 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -5,6 +5,13 @@ distdir=/var/tmp/dist/[% project %] [% c("var/set_PTDIR_DOCSDIR") -%] mkdir -p $PTDIR $DOCSDIR +[% IF c("var/android") -%] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] + # We need to explicitly set CGO_ENABLED with Go 1.13.x as the Android build + # breaks otherwise. + export CGO_ENABLED=1 +[% END -%] + tar -C /var/tmp/dist -xf [% c('input_files_by_name/uniuri') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/pion-webrtc') %] diff --git a/projects/snowflake/config b/projects/snowflake/config index efd0707..898fe70 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -22,3 +22,6 @@ input_files: project: kcp-go - name: smux project: smux + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/android") %]' diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 3f41ed2..809bfa0 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -70,7 +70,7 @@ input_files: enable: '[% ! c("var/android") %]' - project: snowflake name: snowflake - enable: '[% c("var/snowflake") %]' + enable: '[% c("var/snowflake") && ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index c8025ad..dfe1837 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -26,12 +26,17 @@ patch -p1 < $rootdir/0001-Bug-33931-Filter-bridges-in-stream-by-type.patch # Extract obfs4proxy from TorBrowser/Tor/PluggableTransports/obfs4proxy tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/obfs4') %] -# Overwrite the obfs4proxy binary provided by Pluto +# Extract snowflake from TorBrowser/Tor/PluggableTransports/snowflake +tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/snowflake') %] + +# Overwrite the obfs4proxy binary provided by Pluto and add Snowflake for d in external/pluto/bin/*; do cp obfs4proxy $d/ + cp snowflake-client $d/ done rm obfs4proxy +rm snowflake-client # Build Android Libraries and Apps $GRADLE_HOME/gradle-4.10.2/bin/gradle --offline --no-daemon -P androidplugin=3.1.0 -Dmaven.repo.local=$gradle_repo assembleRelease -x lint diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index 5d90481..cffcdd0 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -21,6 +21,8 @@ input_files: project: '[% c("var/compiler") %]' - project: obfs4 name: obfs4 + - project: snowflake + name: snowflake - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' diff --git a/rbm.conf b/rbm.conf index ba1cc23..f2d0f4f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -253,6 +253,9 @@ targets: android_min_api_x86_64: 21 CC: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang' CXX: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang++' + # We only build snowflake on the alpha and nightly + # channels for now. + snowflake: '[% c("var/alpha") || c("var/nightly") %]' container: suite: buster arch: amd64

1 0