August 2018 - tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 26962 - implement new features onboarding (part 1).
by gk＠torproject.org 26 Aug '18

26 Aug '18

commit 69b8d3553d21796db96c0913c5747f8724b9b662 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Aug 24 14:47:31 2018 -0400 Bug 26962 - implement new features onboarding (part 1). Add an "Explore" button to the "Circuit Display" panel within new user onboarding which opens the DuckDuckGo .onion and then guides users through a short circuit display tutorial. Allow a few additional UITour actions while limiting as much as possible how it can be used. Tweak the UITour styles to match the Tor Browser branding. All user interface strings are retrieved from Torbutton's browserOnboarding.properties file. --- browser/app/permissions | 2 + browser/components/uitour/UITour.jsm | 51 +++- browser/components/uitour/content-UITour.js | 2 +- browser/extensions/onboarding/bootstrap.js | 16 ++ .../content/onboarding-tor-circuit-display.js | 283 +++++++++++++++++++++ .../onboarding/content/onboarding-tour-agent.js | 3 - .../extensions/onboarding/content/onboarding.js | 6 +- browser/extensions/onboarding/jar.mn | 1 + browser/themes/shared/UITour.inc.css | 30 +-- 9 files changed, 366 insertions(+), 28 deletions(-) diff --git a/browser/app/permissions b/browser/app/permissions index b4b166c755ae..ac3464afd41c 100644 --- a/browser/app/permissions +++ b/browser/app/permissions @@ -7,6 +7,8 @@ # See nsPermissionManager.cpp for more... # UITour +# DuckDuckGo .onion (used for circuit display onboarding). +origin uitour 1 https://3g2upl4pq6kufc4m.onion origin uitour 1 about:home origin uitour 1 about:newtab origin uitour 1 about:tor diff --git a/browser/components/uitour/UITour.jsm b/browser/components/uitour/UITour.jsm index b282d5c2d885..ce3e20fda662 100644 --- a/browser/components/uitour/UITour.jsm +++ b/browser/components/uitour/UITour.jsm @@ -42,9 +42,23 @@ const PREF_LOG_LEVEL = "browser.uitour.loglevel"; const PREF_SEENPAGEIDS = "browser.uitour.seenPageIDs"; const TOR_BROWSER_PAGE_ACTIONS_ALLOWED = new Set([ + "showInfo", // restricted to TOR_BROWSER_TARGETS_ALLOWED + "showMenu", // restricted to TOR_BROWSER_MENUS_ALLOWED + "hideMenu", // restricted to TOR_BROWSER_MENUS_ALLOWED + "closeTab", "torBrowserOpenSecuritySettings", ]); +const TOR_BROWSER_TARGETS_ALLOWED = new Set([ + "torBrowser-circuitDisplay", + "torBrowser-circuitDisplay-diagram", + "torBrowser-circuitDisplay-newCircuitButton", +]); + +const TOR_BROWSER_MENUS_ALLOWED = new Set([ + "controlCenter", +]); + const BACKGROUND_PAGE_ACTIONS_ALLOWED = new Set([ "forceShowReaderIcon", "getConfiguration", @@ -103,6 +117,14 @@ var UITour = { highlightEffects: ["random", "wobble", "zoom", "color"], targets: new Map([ + ["torBrowser-circuitDisplay", { + query: "#connection-icon", + }], + ["torBrowser-circuitDisplay-diagram", + torBrowserCircuitDisplayTarget("circuit-display-nodes")], + ["torBrowser-circuitDisplay-newCircuitButton", + torBrowserCircuitDisplayTarget("circuit-reload-button")], + ["accountStatus", { query: (aDocument) => { // If the user is logged in, use the avatar element. @@ -945,7 +967,7 @@ var UITour = { // This function is copied to UITourListener. isSafeScheme(aURI) { - let allowedSchemes = new Set(["about"]); + let allowedSchemes = new Set(["about", "https"]); if (!allowedSchemes.has(aURI.scheme)) { log.error("Unsafe scheme:", aURI.scheme); @@ -988,7 +1010,10 @@ var UITour = { return Promise.reject("Invalid target name specified"); } - let targetObject = this.targets.get(aTargetName); + let targetObject; + if (TOR_BROWSER_TARGETS_ALLOWED.has(aTargetName)) { + targetObject = this.targets.get(aTargetName); + } if (!targetObject) { log.warn("getTarget: The specified target name is not in the allowed set"); return Promise.reject("The specified target name is not in the allowed set"); @@ -1389,6 +1414,10 @@ var UITour = { }, showMenu(aWindow, aMenuName, aOpenCallback = null) { + if (!TOR_BROWSER_MENUS_ALLOWED.has(aMenuName)) { + return; + } + log.debug("showMenu:", aMenuName); function openMenuButton(aMenuBtn) { if (!aMenuBtn || !aMenuBtn.boxObject || aMenuBtn.open) { @@ -1485,6 +1514,10 @@ var UITour = { }, hideMenu(aWindow, aMenuName) { + if (!TOR_BROWSER_MENUS_ALLOWED.has(aMenuName)) { + return; + } + log.debug("hideMenu:", aMenuName); function closeMenuButton(aMenuBtn) { if (aMenuBtn && aMenuBtn.boxObject) @@ -1872,6 +1905,20 @@ function controlCenterTrackingToggleTarget(aUnblock) { }; } +function torBrowserCircuitDisplayTarget(aElemID) { + return { + infoPanelPosition: "rightcenter topleft", + query(aDocument) { + let popup = aDocument.defaultView.gIdentityHandler._identityPopup; + if (popup.state != "open") { + return null; + } + let element = aDocument.getElementById(aElemID); + return UITour.isElementVisible(element) ? element : null; + }, + }; +} + this.UITour.init(); /** diff --git a/browser/components/uitour/content-UITour.js b/browser/components/uitour/content-UITour.js index 88d300c91419..8cd7be0c456b 100644 --- a/browser/components/uitour/content-UITour.js +++ b/browser/components/uitour/content-UITour.js @@ -28,7 +28,7 @@ var UITourListener = { // This function is copied from UITour.jsm. isSafeScheme(aURI) { - let allowedSchemes = new Set(["about"]); + let allowedSchemes = new Set(["about", "https"]); if (!allowedSchemes.has(aURI.scheme)) return false; diff --git a/browser/extensions/onboarding/bootstrap.js b/browser/extensions/onboarding/bootstrap.js index c553abe39759..4bc6d468dce9 100644 --- a/browser/extensions/onboarding/bootstrap.js +++ b/browser/extensions/onboarding/bootstrap.js @@ -87,6 +87,19 @@ function setPrefs(prefs) { }); } +function openTorCircuitDisplayPage() { + let kFrameScript = "resource://onboarding/onboarding-tor-circuit-display.js"; + const kOnionURL = "https://3g2upl4pq6kufc4m.onion/"; // DuckDuckGo + let win = Services.wm.getMostRecentWindow('navigator:browser'); + if (win) { + let tabBrowser = win.gBrowser; + let tab = tabBrowser.addTab(kOnionURL); + tabBrowser.selectedTab = tab; + let b = tabBrowser.getBrowserForTab(tab); + b.messageManager.loadFrameScript(kFrameScript, true); + } +} + /** * syncTourChecker listens to and maintains the login status inside, and can be * queried at any time once initialized. @@ -160,6 +173,9 @@ function initContentMessageListener() { isLoggedIn: syncTourChecker.isLoggedIn() }); break; + case "tor-open-circuit-display-page": + openTorCircuitDisplayPage(); + break; #if 0 // No telemetry in Tor Browser. case "ping-centre": diff --git a/browser/extensions/onboarding/content/onboarding-tor-circuit-display.js b/browser/extensions/onboarding/content/onboarding-tor-circuit-display.js new file mode 100644 index 000000000000..de4b23c84c2a --- /dev/null +++ b/browser/extensions/onboarding/content/onboarding-tor-circuit-display.js @@ -0,0 +1,283 @@ +// Copyright (c) 2018, The Tor Project, Inc. +// vim: set sw=2 sts=2 ts=8 et syntax=javascript: + +let gStringBundle; + +let domLoadedListener = (aEvent) => { + let doc = aEvent.originalTarget; + if (doc.nodeName == "#document") { + removeEventListener("DOMContentLoaded", domLoadedListener); + beginCircuitDisplayOnboarding(); + } +}; + +addEventListener("DOMContentLoaded", domLoadedListener, false); + +function beginCircuitDisplayOnboarding() { + // 1 of 3: Show the introductory "How do circuits work?" info panel. + let target = "torBrowser-circuitDisplay"; + let title = getStringFromName("intro.title"); + let msg = getStringFromName("intro.msg"); + let button1Label = getStringFromName("one-of-three"); + let button2Label = getStringFromName("next"); + let buttons = []; + buttons.push({label: button1Label, style: "text"}); + buttons.push({label: button2Label, style: "primary", callback: function() { + showCircuitDiagram(); }}); + let options = {closeButtonCallback: function() { cleanUp(); }}; + Mozilla.UITour.showInfo(target, title, msg, undefined, buttons, options); +} + +function showCircuitDiagram() { + // 2 of 3: Open the control center and show the circuit diagram info panel. + Mozilla.UITour.showMenu("controlCenter", function() { + let target = "torBrowser-circuitDisplay-diagram"; + let title = getStringFromName("diagram.title"); + let msg = getStringFromName("diagram.msg"); + let button1Label = getStringFromName("two-of-three"); + let button2Label = getStringFromName("next"); + let buttons = []; + buttons.push({label: button1Label, style: "text"}); + buttons.push({label: button2Label, style: "primary", callback: function() { + showNewCircuitButton(); }}); + let options = {closeButtonCallback: function() { cleanUp(); }}; + Mozilla.UITour.showInfo(target, title, msg, undefined, buttons, options); + }); +} + +function showNewCircuitButton() { + // 3 of 3: Show the New Circuit button info panel. + let target = "torBrowser-circuitDisplay-newCircuitButton"; + let title = getStringFromName("new-circuit.title"); + let msg = getStringFromName("new-circuit.msg"); + let button1Label = getStringFromName("three-of-three"); + let button2Label = getStringFromName("done"); + let buttons = []; + buttons.push({label: button1Label, style: "text"}); + buttons.push({label: button2Label, style: "primary", callback: function() { + cleanUp(); }}); + let options = {closeButtonCallback: function() { cleanUp(); }}; + Mozilla.UITour.showInfo(target, title, msg, undefined, buttons, options); +} + +function cleanUp() { + Mozilla.UITour.hideMenu("controlCenter"); + Mozilla.UITour.closeTab(); +} + +function getStringFromName(aName) { + const TORBUTTON_BUNDLE_URI = "chrome://torbutton/locale/browserOnboarding.properties"; + const PREFIX = "onboarding.tor-circuit-display."; + + if (!gStringBundle) { + gStringBundle = Services.strings.createBundle(TORBUTTON_BUNDLE_URI) + } + + let result; + try { + result = gStringBundle.GetStringFromName(PREFIX + aName); + } catch (e) { + result = aName; + } + return result; +} + + +// The remainder of the code in this file was adapted from +// browser/components/uitour/UITour-lib.js (unfortunately, we cannot use that +// code here because it directly accesses 'document' and it assumes that the +// content window is the global JavaScript object), + +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +// create namespace +if (typeof Mozilla == "undefined") { + var Mozilla = {}; +} + +(function($) { + "use strict"; + + // create namespace + if (typeof Mozilla.UITour == "undefined") { + /** + * Library that exposes an event-based Web API for communicating with the + * desktop browser chrome. It can be used for tasks such as opening menu + * panels and highlighting the position of buttons in the toolbar. + * + * <p>For security/privacy reasons `Mozilla.UITour` will only work on a list of allowed + * secure origins. The list of allowed origins can be found in + * {@link https://dxr.mozilla.org/mozilla-central/source/browser/app/permissions| + * browser/app/permissions}.</p> + * + * @since 29 + * @namespace + */ + Mozilla.UITour = {}; + } + + function _sendEvent(action, data) { + var event = new content.CustomEvent("mozUITour", { + bubbles: true, + detail: { + action, + data: data || {} + } + }); + + content.document.dispatchEvent(event); + } + + function _generateCallbackID() { + return Math.random().toString(36).replace(/[^a-z]+/g, ""); + } + + function _waitForCallback(callback) { + var id = _generateCallbackID(); + + function listener(event) { + if (typeof event.detail != "object") + return; + if (event.detail.callbackID != id) + return; + + content.document.removeEventListener("mozUITourResponse", listener); + callback(event.detail.data); + } + content.document.addEventListener("mozUITourResponse", listener); + + return id; + } + + /** + * Show an arrow panel with optional images and buttons anchored at a specific UI target. + * + * @see Mozilla.UITour.hideInfo + * + * @param {Mozilla.UITour.Target} target - Identifier of the UI widget to anchor the panel at. + * @param {String} title - Title text to be shown as the heading of the panel. + * @param {String} text - Body text of the panel. + * @param {String} [icon=null] - URL of a 48x48px (96px @ 2dppx) image (which will be resolved + * relative to the tab's URI) to display in the panel. + * @param {Object[]} [buttons=[]] - Array of objects describing buttons. + * @param {String} buttons[].label - Button label + * @param {String} buttons[].icon - Button icon URL + * @param {String} buttons[].style - Button style ("primary" or "link") + * @param {Function} buttons[].callback - Called when the button is clicked + * @param {Object} [options={}] - Advanced options + * @param {Function} options.closeButtonCallback - Called when the panel's close button is clicked. + * + * @example + * var buttons = [ + * { + * label: 'Cancel', + * style: 'link', + * callback: cancelBtnCallback + * }, + * { + * label: 'Confirm', + * style: 'primary', + * callback: confirmBtnCallback + * } + * ]; + * + * var icon = '//mozorg.cdn.mozilla.net/media/img/firefox/australis/logo.png'; + * + * var options = { + * closeButtonCallback: closeBtnCallback + * }; + * + * Mozilla.UITour.showInfo('appMenu', 'my title', 'my text', icon, buttons, options); + */ + Mozilla.UITour.showInfo = function(target, title, text, icon, buttons, options) { + var buttonData = []; + if (Array.isArray(buttons)) { + for (var i = 0; i < buttons.length; i++) { + buttonData.push({ + label: buttons[i].label, + icon: buttons[i].icon, + style: buttons[i].style, + callbackID: _waitForCallback(buttons[i].callback) + }); + } + } + + var closeButtonCallbackID, targetCallbackID; + if (options && options.closeButtonCallback) + closeButtonCallbackID = _waitForCallback(options.closeButtonCallback); + if (options && options.targetCallback) + targetCallbackID = _waitForCallback(options.targetCallback); + + _sendEvent("showInfo", { + target, + title, + text, + icon, + buttons: buttonData, + closeButtonCallbackID, + targetCallbackID + }); + }; + + /** + * Hide any visible info panels. + * @see Mozilla.UITour.showInfo + */ + Mozilla.UITour.hideInfo = function() { + _sendEvent("hideInfo"); + }; + + /** + * Open the named application menu. + * + * @see Mozilla.UITour.hideMenu + * + * @param {Mozilla.UITour.MenuName} name - Menu name + * @param {Function} [callback] - Callback to be called with no arguments when + * the menu opens. + * + * @example + * Mozilla.UITour.showMenu('appMenu', function() { + * console.log('menu was opened'); + * }); + */ + Mozilla.UITour.showMenu = function(name, callback) { + var showCallbackID; + if (callback) + showCallbackID = _waitForCallback(callback); + + _sendEvent("showMenu", { + name, + showCallbackID, + }); + }; + + /** + * Close the named application menu. + * + * @see Mozilla.UITour.showMenu + * + * @param {Mozilla.UITour.MenuName} name - Menu name + */ + Mozilla.UITour.hideMenu = function(name) { + _sendEvent("hideMenu", { + name + }); + }; + + /** + * @summary Closes the tab where this code is running. As usual, if the tab is in the + * foreground, the tab that was displayed before is selected. + * + * @description The last tab in the current window will never be closed, in which case + * this call will have no effect. The calling code is expected to take an + * action after a small timeout in order to handle this case, for example by + * displaying a goodbye message or a button to restart the tour. + * @since 46 + */ + Mozilla.UITour.closeTab = function() { + _sendEvent("closeTab"); + }; +})(); diff --git a/browser/extensions/onboarding/content/onboarding-tour-agent.js b/browser/extensions/onboarding/content/onboarding-tour-agent.js index af93f7220730..b373c5e0ef01 100644 --- a/browser/extensions/onboarding/content/onboarding-tour-agent.js +++ b/browser/extensions/onboarding/content/onboarding-tour-agent.js @@ -18,9 +18,6 @@ let onCanSetDefaultBrowserInBackground = () => { let onClick = evt => { switch (evt.target.id) { - case "onboarding-tour-tor-circuit-display-button": - // TODO: open circuit display onboarding - break; case "onboarding-tour-tor-security-button": Mozilla.UITour.torBrowserOpenSecuritySettings(); break; diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js index 0cfc763e4f5e..de382ac34890 100644 --- a/browser/extensions/onboarding/content/onboarding.js +++ b/browser/extensions/onboarding/content/onboarding.js @@ -159,17 +159,14 @@ var onboardingTourset = { "circuit-display": { id: "onboarding-tour-tor-circuit-display", tourNameId: "onboarding.tour-tor-circuit-display", - instantComplete: true, getPage(win) { let div = win.document.createElement("div"); createOnboardingTourDescription(div, "onboarding.tour-tor-circuit-display.title", "onboarding.tour-tor-circuit-display.description"); createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-circuit-display.png"); -/* TODO: Circuit display onboarding will be implemented in bug 26962. createOnboardingTourButton(div, "onboarding-tour-tor-circuit-display-button", "onboarding.tour-tor-circuit-display.button"); -*/ return div; }, @@ -916,6 +913,9 @@ class Onboarding { this.gotoPage("onboarding-tour-tor-circuit-display"); handledTourActionClick = true; break; + case "onboarding-tour-tor-circuit-display-button": + sendMessageToChrome("tor-open-circuit-display-page"); + break; } if (classList.contains("onboarding-tour-item")) { telemetry({ diff --git a/browser/extensions/onboarding/jar.mn b/browser/extensions/onboarding/jar.mn index f7fb13d033ce..8263aa14ebcd 100644 --- a/browser/extensions/onboarding/jar.mn +++ b/browser/extensions/onboarding/jar.mn @@ -10,6 +10,7 @@ content/img/ (content/img/*) * content/onboarding-tour-agent.js (content/onboarding-tour-agent.js) * content/onboarding.js (content/onboarding.js) + content/onboarding-tor-circuit-display.js (content/onboarding-tor-circuit-display.js) # Package UITour-lib.js in here rather than under # /browser/components/uitour to avoid "unreferenced files" error when # Onboarding extension is not built. diff --git a/browser/themes/shared/UITour.inc.css b/browser/themes/shared/UITour.inc.css index 1e4298afb82d..ca46be282b51 100644 --- a/browser/themes/shared/UITour.inc.css +++ b/browser/themes/shared/UITour.inc.css @@ -49,7 +49,8 @@ } #UITourTooltipTitle { - font-size: 1.45rem; + color: #420C5D; + font-size: 16px; font-weight: bold; margin: 0; } @@ -57,7 +58,8 @@ #UITourTooltipDescription { margin-inline-start: 0; margin-inline-end: 0; - font-size: 1.15rem; + color: #4A4A4A; + font-size: 13px; line-height: 1.8rem; margin-bottom: 0; /* Override global.css */ } @@ -79,7 +81,6 @@ #UITourTooltipButtons { -moz-box-pack: end; background-color: hsla(210,4%,10%,.07); - border-top: 1px solid hsla(210,4%,10%,.14); margin: 10px -16px -16px; padding: 16px; } @@ -113,28 +114,20 @@ #UITourTooltipButtons > button:not(.button-link) { -moz-appearance: none; background-color: rgb(251,251,251); - border-radius: 3px; - border: 1px solid; - border-color: rgb(192,192,192); + border-radius: 2px; color: rgb(71,71,71); - padding: 4px 30px; + padding: 6px 30px; transition-property: background-color, border-color; transition-duration: 150ms; } -#UITourTooltipButtons > button:not(.button-link):not(:active):hover { - background-color: hsla(210,4%,10%,.15); - border-color: hsla(210,4%,10%,.15); - box-shadow: 0 1px 0 0 hsla(210,4%,10%,.05) inset; -} - #UITourTooltipButtons > label, #UITourTooltipButtons > button.button-link { -moz-appearance: none; background: transparent; border: none; box-shadow: none; - color: rgba(0,0,0,0.35); + color: #4A4A4A; padding-left: 10px; padding-right: 10px; } @@ -143,14 +136,13 @@ color: black; } -/* The primary button gets the same color as the customize button. */ #UITourTooltipButtons > button.button-primary { - background-color: rgb(116,191,67); + background-color: #420C5D; color: white; - padding-left: 30px; - padding-right: 30px; + padding-left: 28px; + padding-right: 28px; } #UITourTooltipButtons > button.button-primary:not(:active):hover { - background-color: rgb(105,173,61); + background-color: #410A4E; }

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 27213 - Update about:tbupdate to new (about:tor) layout
by gk＠torproject.org 26 Aug '18

26 Aug '18

commit 61d599ed4c5bb5ace0fc958faaf302dc968cc542 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Aug 24 14:51:11 2018 -0400 Bug 27213 - Update about:tbupdate to new (about:tor) layout Adjust colors, fonts, and the page background to match the new about:tor. --- .../base/content/abouttbupdate/aboutTBUpdate.css | 27 ++++++++++++++++------ 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.css b/browser/base/content/abouttbupdate/aboutTBUpdate.css index c171c58624ec..2b73552729fc 100644 --- a/browser/base/content/abouttbupdate/aboutTBUpdate.css +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.css @@ -1,7 +1,20 @@ +/* + * Copyright (c) 2018, The Tor Project, Inc. + * See LICENSE for licensing information. + * + * vim: set sw=2 sts=2 ts=8 et syntax=css: + */ + +:root { + --abouttor-text-color: white; + --abouttor-bg-toron-color: #420C5D; +} + body { - font-family: sans-serif; + font-family: Helvetica, Arial, sans-serif; font-size: 110%; - background-image: -moz-linear-gradient(top, #ffffff, #ffffff 10%, #d5ffd5 50%, #d5ffd5); + color: var(--abouttor-text-color); + background-color: var(--abouttor-bg-toron-color); background-attachment: fixed; background-size: 100% 100%; } @@ -13,11 +26,13 @@ body { right: 6px; height: 30px; width: 200px; + font-size: 15px; white-space: pre-wrap; text-align: right; - color: #4d4d4d; - font-family: "Liberation Sans", Arial, Helvetica, sans-serif; - font-size: 14px; +} + +a { + color: var(--abouttor-text-color); } #logo { @@ -35,7 +50,6 @@ body { #msg-updated { font-size: 120%; - font-weight: bold; margin-bottom: 20px; } @@ -44,7 +58,6 @@ body { } #changelog-heading { - font-weight: bold; margin-bottom: 4px; }

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] fixup! Bug 21569: Add first-party domain to Permissions key
by gk＠torproject.org 26 Aug '18

26 Aug '18

commit d55b7bb578cf644e780d27efa2355c2046bcf689 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Aug 23 09:32:36 2018 -0400 fixup! Bug 21569: Add first-party domain to Permissions key --- browser/components/uitour/content-UITour.js | 3 ++- extensions/cookie/nsPermissionManager.cpp | 28 ++++++++++++++++++---------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/browser/components/uitour/content-UITour.js b/browser/components/uitour/content-UITour.js index be51b8383d6b..88d300c91419 100644 --- a/browser/components/uitour/content-UITour.js +++ b/browser/components/uitour/content-UITour.js @@ -48,7 +48,8 @@ var UITourListener = { if (!this.isSafeScheme(uri)) return false; - let permission = Services.perms.testPermission(uri, UITOUR_PERMISSION); + let permission = Services.perms.testPermissionFromPrincipal( + content.document.nodePrincipal, UITOUR_PERMISSION); if (permission == Services.perms.ALLOW_ACTION) return true; diff --git a/extensions/cookie/nsPermissionManager.cpp b/extensions/cookie/nsPermissionManager.cpp index 29958695f851..62c7277c7d84 100644 --- a/extensions/cookie/nsPermissionManager.cpp +++ b/extensions/cookie/nsPermissionManager.cpp @@ -207,7 +207,8 @@ GetOriginFromPrincipal(nsIPrincipal* aPrincipal, nsACString& aOrigin) } nsresult -GetPrincipalFromOrigin(const nsACString& aOrigin, nsIPrincipal** aPrincipal) +GetPrincipalFromOrigin(const nsACString& aOrigin, bool aAddFirstParty, + nsIPrincipal** aPrincipal) { nsAutoCString originNoSuffix; mozilla::OriginAttributes attrs; @@ -223,6 +224,13 @@ GetPrincipalFromOrigin(const nsACString& aOrigin, nsIPrincipal** aPrincipal) nsresult rv = NS_NewURI(getter_AddRefs(uri), originNoSuffix); NS_ENSURE_SUCCESS(rv, rv); + // aAddFirstParty is true when adding the default permissions from + // browser/app/permissions because those permissions refer to the + // first party domain. + if (aAddFirstParty) { + attrs.SetFirstPartyDomain(true, uri); + } + nsCOMPtr<nsIPrincipal> principal = mozilla::BasePrincipal::CreateCodebasePrincipal(uri, attrs); principal.forget(aPrincipal); return NS_OK; @@ -419,7 +427,7 @@ public: int64_t aModificationTime) final { nsCOMPtr<nsIPrincipal> principal; - nsresult rv = GetPrincipalFromOrigin(aOrigin, getter_AddRefs(principal)); + nsresult rv = GetPrincipalFromOrigin(aOrigin, false, getter_AddRefs(principal)); NS_ENSURE_SUCCESS(rv, rv); return mPm->AddInternal(principal, aType, aPermission, mID, @@ -2250,7 +2258,7 @@ nsPermissionManager::GetPermissionObject(nsIPrincipal* aPrincipal, } nsCOMPtr<nsIPrincipal> principal; - nsresult rv = GetPrincipalFromOrigin(entry->GetKey()->mOrigin, getter_AddRefs(principal)); + nsresult rv = GetPrincipalFromOrigin(entry->GetKey()->mOrigin, false, getter_AddRefs(principal)); NS_ENSURE_SUCCESS(rv, rv); PermissionEntry& perm = entry->GetPermissions()[idx]; @@ -2498,7 +2506,7 @@ NS_IMETHODIMP nsPermissionManager::GetEnumerator(nsISimpleEnumerator **aEnum) } nsCOMPtr<nsIPrincipal> principal; - nsresult rv = GetPrincipalFromOrigin(entry->GetKey()->mOrigin, + nsresult rv = GetPrincipalFromOrigin(entry->GetKey()->mOrigin, false, getter_AddRefs(principal)); if (NS_FAILED(rv)) { continue; @@ -2593,7 +2601,7 @@ nsPermissionManager::RemoveAllModifiedSince(int64_t aModificationTime) } nsCOMPtr<nsIPrincipal> principal; - nsresult rv = GetPrincipalFromOrigin(entry->GetKey()->mOrigin, + nsresult rv = GetPrincipalFromOrigin(entry->GetKey()->mOrigin, false, getter_AddRefs(principal)); if (NS_FAILED(rv)) { continue; @@ -2664,7 +2672,7 @@ nsPermissionManager::RemovePermissionsWithAttributes(mozilla::OriginAttributesPa PermissionHashKey* entry = iter.Get(); nsCOMPtr<nsIPrincipal> principal; - nsresult rv = GetPrincipalFromOrigin(entry->GetKey()->mOrigin, + nsresult rv = GetPrincipalFromOrigin(entry->GetKey()->mOrigin, false, getter_AddRefs(principal)); if (NS_FAILED(rv)) { continue; @@ -2851,7 +2859,7 @@ nsPermissionManager::Read() modificationTime = stmt->AsInt64(6); nsCOMPtr<nsIPrincipal> principal; - nsresult rv = GetPrincipalFromOrigin(origin, getter_AddRefs(principal)); + nsresult rv = GetPrincipalFromOrigin(origin, false, getter_AddRefs(principal)); if (NS_FAILED(rv)) { readError = true; continue; @@ -3010,7 +3018,7 @@ nsPermissionManager::_DoImport(nsIInputStream *inputStream, mozIStorageConnectio continue; nsCOMPtr<nsIPrincipal> principal; - error = GetPrincipalFromOrigin(lineArray[3], getter_AddRefs(principal)); + error = GetPrincipalFromOrigin(lineArray[3], true, getter_AddRefs(principal)); if (NS_FAILED(error)) { NS_WARNING("Couldn't import an origin permission - malformed origin"); continue; @@ -3240,7 +3248,7 @@ nsPermissionManager::SetPermissionsWithKey(const nsACString& aPermissionKey, // Add the permissions locally to our process for (IPC::Permission& perm : aPerms) { nsCOMPtr<nsIPrincipal> principal; - nsresult rv = GetPrincipalFromOrigin(perm.origin, getter_AddRefs(principal)); + nsresult rv = GetPrincipalFromOrigin(perm.origin, false, getter_AddRefs(principal)); if (NS_WARN_IF(NS_FAILED(rv))) { continue; } @@ -3296,7 +3304,7 @@ nsPermissionManager::GetKeyForOrigin(const nsACString& aOrigin, nsACString& aKey // Parse the origin string into a principal, and extract some useful // information from it for assertions. nsCOMPtr<nsIPrincipal> dbgPrincipal; - MOZ_ALWAYS_SUCCEEDS(GetPrincipalFromOrigin(aOrigin, getter_AddRefs(dbgPrincipal))); + MOZ_ALWAYS_SUCCEEDS(GetPrincipalFromOrigin(aOrigin, false, getter_AddRefs(dbgPrincipal))); nsCOMPtr<nsIURI> dbgUri; MOZ_ALWAYS_SUCCEEDS(dbgPrincipal->GetURI(getter_AddRefs(dbgUri))); nsAutoCString dbgScheme;

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 26962 - implement new features onboarding (part 2).
by gk＠torproject.org 26 Aug '18

26 Aug '18

commit d5f82c2a5747108cc60607b3b7608e9c34640848 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Aug 24 14:52:52 2018 -0400 Bug 26962 - implement new features onboarding (part 2). Add a "New Circuit Display" promotional banner to the about:tbupdate page. --- .../base/content/abouttbupdate/aboutTBUpdate.css | 25 ++++++++++++++++++++++ .../base/content/abouttbupdate/aboutTBUpdate.js | 9 +++++++- .../base/content/abouttbupdate/aboutTBUpdate.xhtml | 5 +++++ browser/base/content/tab-content.js | 10 +++++++++ .../locales/en-US/chrome/browser/aboutTBUpdate.dtd | 4 ++++ 5 files changed, 52 insertions(+), 1 deletion(-) diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.css b/browser/base/content/abouttbupdate/aboutTBUpdate.css index 2b73552729fc..7ec1950e1474 100644 --- a/browser/base/content/abouttbupdate/aboutTBUpdate.css +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.css @@ -53,6 +53,31 @@ a { margin-bottom: 20px; } +#new-features { + margin-bottom: 15px; + padding: 10px; + text-align: center; + /* swap text and background colors in this section */ + color: var(--abouttor-bg-toron-color); + background-color: var(--abouttor-text-color); +} + +#new-features-description { + margin: 15px auto; + max-width: 500px; + font-size: 85%; +} + +#new-features button { + padding: 8px 20px; + border: none; + border-radius: 3px; + font-size: 90%; + color: var(--abouttor-text-color); + background-color: var(--abouttor-bg-toron-color); + cursor: pointer; +} + #changelog-container { margin: 0px 20px 20px 20px; } diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.js b/browser/base/content/abouttbupdate/aboutTBUpdate.js index 8243647c5708..fa8bd3241a28 100644 --- a/browser/base/content/abouttbupdate/aboutTBUpdate.js +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.js @@ -1,4 +1,4 @@ -// Copyright (c) 2015, The Tor Project, Inc. +// Copyright (c) 2018, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -8,3 +8,10 @@ function init() let event = new CustomEvent("AboutTBUpdateLoad", { bubbles: true }); document.dispatchEvent(event); } + +function showNewFeaturesOnboarding() +{ + let event = new CustomEvent("AboutTBUpdateNewFeaturesOnboarding", + { bubbles: true }); + document.dispatchEvent(event); +} diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml index fe8ed69b537f..a046f2658a5a 100644 --- a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml @@ -28,6 +28,11 @@ </div> </div> <br clear="all"/> +<div id="new-features"> + <div>&aboutTBUpdate.circuitDisplayHeading;</div> + <div id="new-features-description">&aboutTBUpdate.circuitDisplayDescription;</div> + <button onclick="showNewFeaturesOnboarding()">&aboutTBUpdate.learnMore;</button> +</div> <div id="changelog-container"> <div id="changelog-heading">&aboutTBUpdate.changeLogHeading;</div> <div id="changelog"></div> diff --git a/browser/base/content/tab-content.js b/browser/base/content/tab-content.js index e0cf6747aaa4..c0987dbc05c7 100644 --- a/browser/base/content/tab-content.js +++ b/browser/base/content/tab-content.js @@ -359,6 +359,8 @@ AboutReaderListener.init(); let AboutTBUpdateListener = { init: function(chromeGlobal) { chromeGlobal.addEventListener('AboutTBUpdateLoad', this, false, true); + chromeGlobal.addEventListener("AboutTBUpdateNewFeaturesOnboarding", + this, false, true); }, get isAboutTBUpdate() { @@ -373,6 +375,9 @@ let AboutTBUpdateListener = { case "AboutTBUpdateLoad": this.onPageLoad(); break; + case "AboutTBUpdateNewFeaturesOnboarding": + this.onNewFeaturesOnboarding(); + break; case "pagehide": this.onPageHide(aEvent); break; @@ -406,6 +411,11 @@ let AboutTBUpdateListener = { removeEventListener("pagehide", this, true); }, + onNewFeaturesOnboarding: function() { + // Tell the onboarding extension to open the circuit display onboarding. + sendAsyncMessage("Onboarding:OnContentMessage", + {action: "tor-open-circuit-display-page"}); + }, }; AboutTBUpdateListener.init(this); #endif diff --git a/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd b/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd index 37567bd7e38c..f7b3f2ed8fcd 100644 --- a/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd +++ b/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd @@ -4,3 +4,7 @@ <!ENTITY aboutTBUpdate.linkLabel "visit our website"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> + +<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> +<!ENTITY aboutTBUpdate.learnMore "Learn More">

1 0

[torbutton/master] Bug 26962: Circuit display onboarding (part 2).
by gk＠torproject.org 26 Aug '18

26 Aug '18

commit c93f06417e0bdbd6d709ec5109938347d1d38123 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Aug 23 16:44:06 2018 -0400 Bug 26962: Circuit display onboarding (part 2). Add strings for a "New Circuit Display" promotional banner which is shown on the about:tbupdate page. --- src/chrome/locale/en/aboutTBUpdate.dtd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/chrome/locale/en/aboutTBUpdate.dtd b/src/chrome/locale/en/aboutTBUpdate.dtd index 37567bd7..f7b3f2ed 100644 --- a/src/chrome/locale/en/aboutTBUpdate.dtd +++ b/src/chrome/locale/en/aboutTBUpdate.dtd @@ -4,3 +4,7 @@ <!ENTITY aboutTBUpdate.linkLabel "visit our website"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> + +<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> +<!ENTITY aboutTBUpdate.learnMore "Learn More">

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 25 Aug '18

25 Aug '18

commit ad4624a470a0791ebe836c1b83df88b54f361286 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Aug 24 18:25:10 2018 -0700 squash! TB4: Tor Browser's Firefox preference overrides. Bug 27268: Remove references to obsolete prefs. Removed prefs are: browser.usedOnWindows10 browser.selfsupport.enabled browser.selfsupport.url browser.newtabpage.directory.ping browser.newtabpage.directory.source browser.newtabpage.enhanced browser.newtabpage.introShown browser.newtabpage.remote plugin.expose_full_path plugins.hide_infobar_for_missing_plugin plugins.hideMissingPluginsNotification dom.mozTCPSocket.enabled --- browser/app/profile/000-tor-browser.js | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 6fe5955960e2..082b69a11ffe 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -9,8 +9,6 @@ pref("browser.search.update", false); pref("browser.rights.3.shown", true); pref("startup.homepage_welcome_url", ""); pref("startup.homepage_welcome_url.additional", ""); -// Not set Windows 10 users would get a special introduction on first start. -pref("browser.usedOnWindows10", true); // Set a generic, default URL that will be opened in a tab after an update. // Typically, this will not be used; instead, the <update> element within @@ -89,10 +87,8 @@ pref("datareporting.policy.dataSubmissionEnabled", false); // Don't fetch a localized remote page that Tor Browser interacts with, see // #16727. And, yes, it is "reportUrl" and not "reportURL". pref("datareporting.healthreport.about.reportUrl", "data:text/plain,"); -// Make sure Selfsupport and Unified Telemetry are really disabled, see: #18738. pref("datareporting.healthreport.about.reportUrlUnified", "data:text/plain,"); -pref("browser.selfsupport.enabled", false); -pref("browser.selfsupport.url", ""); +// Make sure Unified Telemetry is really disabled, see: #18738. pref("toolkit.telemetry.unified", false); pref("toolkit.telemetry.enabled", false); // No experiments, use Tor Browser. See 21797. @@ -103,12 +99,7 @@ pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs pref("services.sync.engine.addons", false); pref("services.sync.engine.tabs", false); pref("extensions.getAddons.cache.enabled", false); // https://blog.mozilla.org/addons/how-to-opt-out-of-add-on-metadata-updates/ -pref("browser.newtabpage.directory.ping", "data:text/plain,"); // Bug 16316 - Avoid potential confusion over tiles for now. -pref("browser.newtabpage.directory.source", "data:text/plain,"); // Bug 16316 - Avoid potential confusion over tiles for now. -pref("browser.newtabpage.enhanced", false); // Bug 16316 - Avoid potential confusion over tiles for now. -pref("browser.newtabpage.introShown", true); // Bug 16316 - Avoid potential confusion over tiles for now. pref("browser.newtabpage.preload", false); // Bug 16316 - Avoid potential confusion over tiles for now. -pref("browser.newtabpage.remote", false); // Bug 21685: Disable remote new tab pages pref("browser.search.countryCode", "US"); // The next three prefs disable GeoIP search lookups (#16254) pref("browser.search.region", "US"); pref("browser.search.geoip.url", ""); @@ -138,7 +129,6 @@ pref("browser.startup.homepage_override.buildID", "20100101"); pref("general.useragent.vendor", ""); pref("general.useragent.vendorSub", ""); pref("dom.enable_performance", false); -pref("plugin.expose_full_path", false); pref("browser.zoom.siteSpecific", false); pref("intl.charset.default", "windows-1252"); pref("browser.link.open_newwindow.restriction", 0); // Bug 9881: Open popups in new tabs (to avoid fullscreen popups) @@ -197,8 +187,6 @@ pref("network.gio.supported-protocols", ""); pref("plugin.disable", true); // Disable to search plugins on first start pref("plugins.click_to_play", true); pref("plugin.state.flash", 1); -pref("plugins.hide_infobar_for_missing_plugin", true); -pref("plugins.hideMissingPluginsNotification", true); pref("media.peerconnection.enabled", false); // Disable WebRTC interfaces // Disables media devices but only if `media.peerconnection.enabled` is set to // `false` as well. (see bug 16328 for this defense-in-depth measure) @@ -233,8 +221,6 @@ pref("devtools.appmanager.enabled", false); // restrictive DNS look-up policy. We use "127.0.0.1" instead of "localhost" as // a workaround. See bug 16523 for more details. pref("devtools.debugger.chrome-debugging-host", "127.0.0.1"); -// Disable mozTCPSocket for sure (bug 18863) -pref("dom.mozTCPSocket.enabled", false); // Disable using UNC paths (bug 26424 and Mozilla's bug 1413868) pref("network.file.disable_unc_paths", true); // Enhance our treatment of file:// to avoid proxy bypasses (see Mozilla's bug

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] fixup! Regression tests for TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 25 Aug '18

25 Aug '18

commit 7f61bed1a7dd5c6af77f80419fcf0979c78ec2b4 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Aug 25 10:49:46 2018 +0000 fixup! Regression tests for TB4: Tor Browser's Firefox preference overrides. Bug 27268: There is no plugin.expose_full_path anymore The preference got removed in https://bugzil.la/883671. --- tbb-tests/browser_tor_TB4.js | 1 - 1 file changed, 1 deletion(-) diff --git a/tbb-tests/browser_tor_TB4.js b/tbb-tests/browser_tor_TB4.js index 6defb92c60de..d52f9f137336 100644 --- a/tbb-tests/browser_tor_TB4.js +++ b/tbb-tests/browser_tor_TB4.js @@ -80,7 +80,6 @@ let expectedPrefs = [ ["general.useragent.vendor", ""], ["general.useragent.vendorSub", ""], ["dom.enable_performance", false], - ["plugin.expose_full_path", false], ["browser.zoom.siteSpecific", false], ["intl.charset.default", "windows-1252"], //["intl.accept_languages", "en-us, en"], // Set by Torbutton

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 25 Aug '18

25 Aug '18

commit 03c692e334c33c21a2f50c5df75d839b93533e55 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Aug 24 15:37:17 2018 -0700 squash! TB4: Tor Browser's Firefox preference overrides. Bug 27257: Remove obsolete pref "dom.network.enabled" (The API is disabled under privacy.resistFingerprinting.) --- browser/app/profile/000-tor-browser.js | 1 - 1 file changed, 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index a859a7143060..6fe5955960e2 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -126,7 +126,6 @@ pref("webgl.min_capability_mode", true); pref("webgl.disable-extensions", true); pref("webgl.disable-fail-if-major-performance-caveat", true); pref("webgl.enable-webgl2", false); -pref("dom.network.enabled",false); // fingerprinting due to differing OS implementations pref("gfx.downloadable_fonts.fallback_delay", -1); pref("general.appname.override", "Netscape"); pref("general.appversion.override", "5.0 (Windows)");

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 25 Aug '18

25 Aug '18

commit 853758c5aede1fbe3f1402a9bd62b731795f1564 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Aug 24 15:49:25 2018 -0700 squash! TB4: Tor Browser's Firefox preference overrides. Bug 27262: Remove leftover HTTP pipelining preferences The prefs were removed from Firefox in https://bugzilla.mozilla.org/show_bug.cgi?id=1340655 --- browser/app/profile/000-tor-browser.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index bddbe05c92bb..a859a7143060 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -256,10 +256,6 @@ pref("gfx.font_rendering.graphite.enabled", false); pref("security.ssl.enable_false_start", true); pref("network.http.connection-retry-timeout", 0); pref("network.http.max-persistent-connections-per-proxy", 256); -pref("network.http.pipelining.reschedule-timeout", 15000); -pref("network.http.pipelining.read-timeout", 60000); -// Hacked pref: Now means "Attempt to pipeline at least this many requests together" -pref("network.http.pipelining.max-optimistic-requests", 3); pref("network.manage-offline-status", false); // No need to leak things to Mozilla, see bug 21790 pref("network.captive-portal-service.enabled", false);

1 0

[torbutton/master] Bug 26962: Circuit display onboarding
by gk＠torproject.org 24 Aug '18

24 Aug '18

commit dca195a191bf897680dde1363d12f7262dd26910 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Aug 23 10:26:10 2018 -0400 Bug 26962: Circuit display onboarding Add strings needed for circuit display onboarding. --- src/chrome/locale/en/browserOnboarding.properties | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/chrome/locale/en/browserOnboarding.properties b/src/chrome/locale/en/browserOnboarding.properties index 362eefea..49085fba 100644 --- a/src/chrome/locale/en/browserOnboarding.properties +++ b/src/chrome/locale/en/browserOnboarding.properties @@ -36,3 +36,19 @@ onboarding.tour-tor-onion-services=Onion Services onboarding.tour-tor-onion-services.title=Onion Services onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work. onboarding.tour-tor-onion-services.button=Visit an Onion + +# Circuit Display onboarding. +onboarding.tor-circuit-display.next=Next +onboarding.tor-circuit-display.done=Done +onboarding.tor-circuit-display.one-of-three=1 of 3 +onboarding.tor-circuit-display.two-of-three=2 of 3 +onboarding.tor-circuit-display.three-of-three=3 of 3 + +onboarding.tor-circuit-display.intro.title=How do circuits work? +onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. + +onboarding.tor-circuit-display.diagram.title=Circuit Display +onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. + +onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? +onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.

1 0