- tbb-commits - lists.torproject.org

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

15 Aug '18

commit 36724cc11e94d0dc3094c94f046d76fb5ce44a2b Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Jul 31 07:04:43 2018 -0700 squash! TB4: Tor Browser's Firefox preference overrides. Bug 14952: Enable http/2 and AltSvc In Firefox, SPDY/HTTP2 now uses Origin Attributes for isolation of connections, push streams, origin frames, etc. That means we get first-party isolation provided "privacy.firstparty.isolate" is true. So in this patch, we stop overriding "network.http.spdy.enabled" and "network.http.spdy.enabled.http2". Alternate Services also use Origin Attributes for isolation. So we stop overriding "network.http.altsvc.enabled" and "network.http.altsvc.oe" as well. (All 4 of the abovementioned "network.http.*" prefs adopt Firefox 60ESR's default value of true.) However, we want to disable HTTP/2 push for now, so we set "network.http.spdy.allow-push" to false. "network.http.spdy.enabled.http2draft" was removed in Bug 1132357. "network.http.sped.enabled.v2" was removed in Bug 912550. "network.http.sped.enabled.v3" was removed in Bug 1097944. "network.http.sped.enabled.v3-1" was removed in Bug 1248197. --- browser/app/profile/000-tor-browser.js | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index d0fdbe1040b4..e87b38dcb775 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -174,15 +174,8 @@ pref("browser.cache.frecency_experiment", -1); // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation pref("network.cookie.cookieBehavior", 1); -pref("network.http.spdy.enabled", false); // Stores state and may have keepalive issues (both fixable) -pref("network.http.spdy.enabled.v2", false); // Seems redundant, but just in case -pref("network.http.spdy.enabled.v3", false); // Seems redundant, but just in case -pref("network.http.spdy.enabled.v3-1", false); // Seems redundant, but just in case -pref("network.http.spdy.enabled.http2", false); // Temporarily disabled pending implementation review -pref("network.http.spdy.enabled.http2draft", false); // Temporarily disabled pending implementation review +pref("network.http.spdy.allow-push", false); // Disabled for now. See https://bugs.torproject.org/27127 pref("network.predictor.enabled", false); // Temporarily disabled. See https://bugs.torproject.org/16633 -pref("network.http.altsvc.enabled", false); // Temporarily disabled. See https://bugs.torproject.org/16673 -pref("network.http.altsvc.oe", false); // Temporarily disabled. See https://bugs.torproject.org/16673 // Proxy and proxy security pref("network.proxy.socks", "127.0.0.1");

1 0

[torbutton/master] Bug 26189: Remove content-policy.js
by gk＠torproject.org 15 Aug '18

15 Aug '18

commit b9b87bcb3105e7aafb42f162b4bb1e8fc7dc54ba Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Aug 13 09:55:40 2018 -0700 Bug 26189: Remove content-policy.js Our old patch for Bug 8725 was upstreamed in https://bugzilla.mozilla.org/show_bug.cgi?id=863246 --- src/components/content-policy.js | 174 -------------------------------- src/components/startup-observer.js | 7 +- src/defaults/preferences/preferences.js | 2 +- 3 files changed, 3 insertions(+), 180 deletions(-) diff --git a/src/components/content-policy.js b/src/components/content-policy.js deleted file mode 100644 index db72efea..00000000 --- a/src/components/content-policy.js +++ /dev/null @@ -1,174 +0,0 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -/* - * Based on ResourceFilter: A direct workaround for https://bugzil.la/863246 - * https://notabug.org/desktopd/no-resource-uri-leak/src/master/src/resource-f… - */ - -const Cc = Components.classes, Ci = Components.interfaces, Cu = Components.utils; - -// Import XPCOMUtils object. -Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -let { bindPrefAndInit } = - Cu.import("resource://torbutton/modules/utils.js", {}); - -function ContentPolicy() { - this.uriFingerprinting = null; - let that = this; - bindPrefAndInit("extensions.torbutton.resource_and_chrome_uri_fingerprinting", - function (enabled) { - that.uriFingerprinting = enabled; - }); - - // Register as an nsIContentPolicy filter. - let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar); - registrar.registerFactory(this.classID, this.classDescription, - this.contractID, this); - - let catMan = Cc["@mozilla.org/categorymanager;1"] - .getService(Ci.nsICategoryManager); - catMan.addCategoryEntry("content-policy", this.contractID, this.contractID, - false, true); -} - -ContentPolicy.prototype = { - classDescription: "ContentPolicy", - classID: Components.ID("{4c03be7d-492f-990e-f0da-f3689e564898}"), - contractID: "@torproject.org/content-policy;1", - - uriWhitelist: { - // Video playback. - "chrome://global/content/TopLevelVideoDocument.js": Ci.nsIContentPolicy.TYPE_SCRIPT, - "resource://gre/res/TopLevelVideoDocument.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, - "chrome://global/content/bindings/videocontrols.xml": Ci.nsIContentPolicy.TYPE_XBL, - "chrome://global/content/bindings/scale.xml": Ci.nsIContentPolicy.TYPE_XBL, - "chrome://global/content/bindings/progressmeter.xml": Ci.nsIContentPolicy.TYPE_XBL, - "chrome://global/content/bindings/button.xml": Ci.nsIContentPolicy.TYPE_XBL, - "chrome://global/content/bindings/general.xml": Ci.nsIContentPolicy.TYPE_XBL, - "chrome://global/content/bindings/text.xml": Ci.nsIContentPolicy.TYPE_XBL, - - // Image display. - "resource://gre/res/ImageDocument.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, - "resource://gre/res/TopLevelImageDocument.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, - - // Scrollbars, text box resizer, and content keyboard shortcuts. - "chrome://global/content/bindings/scrollbar.xml": Ci.nsIContentPolicy.TYPE_XBL, - "chrome://global/content/bindings/resizer.xml": Ci.nsIContentPolicy.TYPE_XBL, - "chrome://global/content/platformHTMLBindings.xml": Ci.nsIContentPolicy.TYPE_XBL, - - // Directory listing. - "chrome://global/skin/dirListing/dirListing.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, - }, - - uriRegexWhitelist: [ - // Video playback: whitelist png and svg images under chrome://global/skin/media - { regex: /^chrome:\/\/global\/skin\/media\/.+\.(png|svg)$/, - type: Ci.nsIContentPolicy.TYPE_IMAGE }, - - // Video playback and image display: whitelist css files under chrome://global/skin/media - { regex: /^chrome:\/\/global\/skin\/media\/.+\.css$/, - type: Ci.nsIContentPolicy.TYPE_STYLESHEET }, - ], - - // nsISupports - QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPolicy, Ci.nsIFactory, - Ci.nsISupportsWeakReference]), - - // nsIFactory - createInstance: function(outer, iid) - { - if (outer) - throw Cr.NS_ERROR_NO_AGGREGATION; - return this.QueryInterface(iid); - }, - - // nsIContentPolicy - shouldLoad: function(aContentType, aContentLocation, aRequestOrigin, aContext, aMimeTypeGuess, aExtra) { - - // Accept if the user does not care, no content URI is available or scheme - // is not resource/chrome. - if (this.uriFingerprinting || !aContentLocation || - !(aContentLocation.schemeIs('resource') || - aContentLocation.schemeIs('chrome'))) { - return Ci.nsIContentPolicy.ACCEPT; - } - - // Accept if no origin URI or if origin scheme is - // chrome/resource/about/view-source. - if (!aRequestOrigin || aRequestOrigin.schemeIs('resource') || - aRequestOrigin.schemeIs('chrome') || - aRequestOrigin.schemeIs('about') || - aRequestOrigin.schemeIs('view-source')) - return Ci.nsIContentPolicy.ACCEPT; - - // Accept if resource directly loaded into a tab. - if (Ci.nsIContentPolicy.TYPE_DOCUMENT === aContentType) - return Ci.nsIContentPolicy.ACCEPT; - - // There's certain things that break horribly if they aren't allowed to - // access URIs with proscribed schemes, with `aContentOrigin` basically - // set to arbibrary URIs. - // - // XXX: Feature gate this behind the security slider or something, I don't - // give a fuck. - if (aContentLocation.spec in this.uriWhitelist) - if (this.uriWhitelist[aContentLocation.spec] == aContentType) - return Ci.nsIContentPolicy.ACCEPT; - - for (let wlObj of this.uriRegexWhitelist) { - if ((wlObj.type == aContentType) && wlObj.regex.test(aContentLocation.spec)) - return Ci.nsIContentPolicy.ACCEPT; - } - - return Ci.nsIContentPolicy.REJECT_REQUEST; - }, - - shouldProcess: function(aContentType, aContentLocation, aRequestOrigin, aContext, aMimeType, aExtra) { - return Ci.nsIContentPolicy.ACCEPT; - }, -}; - -// Install a HTTP response handler to check for redirects to URLs with schemes -// that should be internal to the browser. There's various safeguards and -// checks that cause the body to be unavailable, but the `onLoad()` behavior -// is inconsistent, which results in leaking information about the specific -// user agent instance (eg: what addons are installed). -var requestObserver = { - ioService: Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService), - observerService: Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService), - - start: function() { - this.observerService.addObserver(this, "http-on-examine-response", false); - }, - - observe: function(aSubject, aTopic, aData) { - let aChannel = aSubject.QueryInterface(Ci.nsIHttpChannel); - let aStatus = aChannel.responseStatus; - - // If this is a redirect... - // - // Note: `304 Not Modifed` isn't a redirect, so there is no Location header to check - // in that case. - if (aStatus >= 300 && aStatus < 400 && aStatus != 304) { - let location = aChannel.getResponseHeader("Location"); - let aUri = this.ioService.newURI(location, null, null); - - // And it's redirecting into the browser or addon's internal URLs... - if (aUri.schemeIs("resource") || aUri.schemeIs("chrome") || aUri.schemeIs("about")) { - // Cancel the request. - aSubject.cancel(Components.results.NS_BINDING_ABORTED); - } - } - }, -}; - -// Create a content policy object; initialization is done in the contructor. -var cp = new ContentPolicy(); - -// In the chrome process, register the request observer to handle redirects. -if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_DEFAULT) { - requestObserver.start(); -} diff --git a/src/components/startup-observer.js b/src/components/startup-observer.js index 144d600a..cd9e7d2c 100644 --- a/src/components/startup-observer.js +++ b/src/components/startup-observer.js @@ -62,13 +62,10 @@ function StartupObserver() { this.logger.log(4, "Early proxy change failed. Will try again at profile load. Error: "+e); } - // Arrange for our nsIContentPolicy filter and about:tor handler to be - // loaded in the default (chrome) process as well as in each content - // process. + // Arrange for our about:tor handler to be loaded in the default (chrome) + // process as well as in each content process. let ppmm = Cc["@mozilla.org/parentprocessmessagemanager;1"] .getService(Ci.nsIProcessScriptLoader); - ppmm.loadProcessScript("resource://torbutton/components/content-policy.js", - true); ppmm.loadProcessScript("resource://torbutton/components/aboutTor.js", true); } diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 43401ad0..428e70bc 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -34,7 +34,7 @@ pref("extensions.torbutton.startup_state", 2); // 0=non-tor, 1=tor, 2=last pref("extensions.torbutton.tor_memory_jar",false); pref("extensions.torbutton.nontor_memory_jar",false); pref("extensions.torbutton.launch_warning",true); -pref("extensions.torbutton.resource_and_chrome_uri_fingerprinting",false); + // Opt out of Firefox addon pings: // https://developer.mozilla.org/en/Addons/Working_with_AMO pref("extensions.torbutton(a)torproject.org.getAddons.cache.enabled", false);

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 26826 - Disable tab queue and delete SYSTEM_ALERT_WINDOW permission
by gk＠torproject.org 15 Aug '18

15 Aug '18

commit de2e1fbe5b024957ed469063bf38b8b274b4f4ba Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Aug 3 21:29:47 2018 +0000 Bug 26826 - Disable tab queue and delete SYSTEM_ALERT_WINDOW permission --- mobile/android/app/src/main/res/xml/preferences_general.xml | 1 + mobile/android/app/src/main/res/xml/preferences_general_tablet.xml | 1 + mobile/android/base/FennecManifest_permissions.xml.in | 3 --- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mobile/android/app/src/main/res/xml/preferences_general.xml b/mobile/android/app/src/main/res/xml/preferences_general.xml index f148ae61b169..ef739db0c3d8 100644 --- a/mobile/android/app/src/main/res/xml/preferences_general.xml +++ b/mobile/android/app/src/main/res/xml/preferences_general.xml @@ -31,6 +31,7 @@ <SwitchPreference android:key="android.not_a_preference.tab_queue" android:title="@string/pref_tab_queue_title" android:summary="@string/pref_tab_queue_summary" + android:selectable="false" android:defaultValue="false" /> <SwitchPreference android:key="android.not_a_preference.compact_tabs" diff --git a/mobile/android/app/src/main/res/xml/preferences_general_tablet.xml b/mobile/android/app/src/main/res/xml/preferences_general_tablet.xml index f05be98277fc..72d4e024b55f 100644 --- a/mobile/android/app/src/main/res/xml/preferences_general_tablet.xml +++ b/mobile/android/app/src/main/res/xml/preferences_general_tablet.xml @@ -37,6 +37,7 @@ <SwitchPreference android:key="android.not_a_preference.tab_queue" android:title="@string/pref_tab_queue_title" android:summary="@string/pref_tab_queue_summary" + android:selectable="false" android:defaultValue="false" /> </PreferenceScreen> diff --git a/mobile/android/base/FennecManifest_permissions.xml.in b/mobile/android/base/FennecManifest_permissions.xml.in index 1b7b2d5475ec..f7bfe475bece 100644 --- a/mobile/android/base/FennecManifest_permissions.xml.in +++ b/mobile/android/base/FennecManifest_permissions.xml.in @@ -46,9 +46,6 @@ #endif <uses-feature android:name="android.hardware.touchscreen"/> -  - <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/> - #ifdef MOZ_ANDROID_BEAM  <uses-permission android:name="android.permission.NFC"/>

1 0

[tor-browser-build/master] Bug 12968: enable HEASLR in Windows x86_64 builds
by gk＠torproject.org 15 Aug '18

15 Aug '18

commit f7247cca852ce5f9cce092ca82cb92efbbba611d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue May 29 13:42:09 2018 +0200 Bug 12968: enable HEASLR in Windows x86_64 builds We still need the other half of the fix for actually providing higher entropy (see bug 12968, comment:17ff. for discussion). --- rbm.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index ff36e6c..cd6dc08 100644 --- a/rbm.conf +++ b/rbm.conf @@ -204,6 +204,8 @@ targets: container: arch: amd64 faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 + # HEASLR is 64 bit only (see bug 12968) + flag_HEASLR: '-Wl,--high-entropy-va' windows-i686: arch: i686 var: @@ -226,7 +228,7 @@ targets: suite: jessie configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"' CFLAGS: '-fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security [% c("var/flag_mwindows") %]' - LDFLAGS: '-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs [% c("var/flag_mwindows") %]' + LDFLAGS: '-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs [% c("var/flag_HEASLR") %] [% c("var/flag_mwindows") %]' flag_mwindows: '-mwindows' compiler: mingw-w64 deps:

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25906 - Imply false both Adjust and Leanplum configure options
by gk＠torproject.org 15 Aug '18

15 Aug '18

commit ccb635fc7b7c02c4431adfbe67bff2f73e491157 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Aug 3 18:32:46 2018 +0000 Bug 25906 - Imply false both Adjust and Leanplum configure options These configure options should be false already, because we set |--without-google-play-services| in .mozconfig-android. But, this is another layer of certainty. --- mobile/android/torbrowser.configure | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mobile/android/torbrowser.configure b/mobile/android/torbrowser.configure index ac30fde888a6..8f3462982dc7 100644 --- a/mobile/android/torbrowser.configure +++ b/mobile/android/torbrowser.configure @@ -44,3 +44,8 @@ imply_option('MOZ_SERVICES_HEALTHREPORT', False) imply_option('MOZ_ANDROID_NETWORK_STATE', False); imply_option('MOZ_ANDROID_LOCATION', False); + +# Exclude Leanplum MMA (marketing automation and user behavior) +imply_option('MOZ_ANDROID_MMA', False); +# Exclude Adjust (installation tracking) +imply_option('MOZ_INSTALL_TRACKING', False);

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 27016 - Create proxy connection during image download
by gk＠torproject.org 15 Aug '18

15 Aug '18

commit dda3c7d44a12cc2d9ff5e071605c8f36670ac956 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Aug 2 21:49:05 2018 +0000 Bug 27016 - Create proxy connection during image download Picasso, the image retrieval library used by Fennec, ignores the network proxy configuration. We override the openConnection() method and create the connection using the configured proxy. --- .../java/org/mozilla/gecko/home/ImageLoader.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/mobile/android/base/java/org/mozilla/gecko/home/ImageLoader.java b/mobile/android/base/java/org/mozilla/gecko/home/ImageLoader.java index 2bbd82a8df77..cbbe7babbba4 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/ImageLoader.java +++ b/mobile/android/base/java/org/mozilla/gecko/home/ImageLoader.java @@ -15,9 +15,14 @@ import com.squareup.picasso.Picasso; import com.squareup.picasso.Downloader.Response; import com.squareup.picasso.UrlConnectionDownloader; +import org.mozilla.gecko.util.ProxySelector; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.URI; +import java.net.URISyntaxException; import java.util.EnumSet; import java.util.Set; @@ -84,6 +89,23 @@ public class ImageLoader { this.distribution = distribution; } + @Override + protected HttpURLConnection openConnection(Uri path) throws IOException { + try { + // This is annoying, but |path| is an android.net.Uri and + // openConnectionWithProxy() accepts a java.net.URI + return (HttpURLConnection)ProxySelector.openConnectionWithProxy( + new URI( + path.getScheme(), path.getHost(), path.getPath(), + path.getEncodedFragment())); + } catch (URISyntaxException ex) { + // And android.net.Uri is more lenient than java.net.URI. + // Uri does not catch syntax errors which URI may catch. + // We'll re-throw this as an IOException + throw new IOException(ex.getMessage()); + } + } + private Density getDensity(float factor) { final DisplayMetrics dm = context.getResources().getDisplayMetrics(); final float densityDpi = dm.densityDpi * factor;

1 0

[tor-browser-build/master] Bug 27129: Add locales ca, ga, id, is, nb
by gk＠torproject.org 15 Aug '18

15 Aug '18

commit ad4233157674808d5d8557ada5ce97a145d8a3e5 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Aug 13 15:13:25 2018 -0700 Bug 27129: Add locales ca, ga, id, is, nb --- rbm.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rbm.conf b/rbm.conf index 8cfa5e2..ff36e6c 100644 --- a/rbm.conf +++ b/rbm.conf @@ -52,15 +52,20 @@ var: locale_ja: ja locales: - ar + - ca - da - de - es-ES - fa - fr + - ga-IE - he + - id + - is - it - '[% c("var/locale_ja") %]' - ko + - nb-NO - nl - pl - pt-BR

1 0

[tor-launcher/master] Bug 27129: Add locales ca, ga, id, is, nb
by gk＠torproject.org 15 Aug '18

15 Aug '18

commit 0fb1ea7e8ec9b118c1aa08f92fef7cb7b47cb4ea Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Aug 13 14:54:36 2018 -0700 Bug 27129: Add locales ca, ga, id, is, nb --- src/chrome/content/network-settings.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 0e18b29..aaa91ac 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -305,16 +305,21 @@ function populateLocaleList(aLangPackAddons) "en-US" : "English", "ar" : "\u0627\u0644\u0639\u0631\u0628\u064a\u0629", "bn-BD" : "\u09ac\u09be\u0982\u09b2\u09be", + "ca" : "català", "da" : "Dansk", "de" : "Deutsch", "es-ES" : "Espa\u00f1ol", "fa" : "\u0641\u0627\u0631\u0633\u06cc", "fr" : "Fran\u00e7ais", + "ga" : "Gaeilge (Irish)", "he" : "\u05e2\u05d1\u05e8\u05d9\u05ea", + "id" : "bahasa Indonesia", + "is" : "\u0355slenska", "it" : "Italiano", "ja" : "\u65e5\u672c\u8a9e", "ko" : "\ud55c\uad6d\uc5b4", "nl" : "Nederlands", + "nb" : "Norsk bokmå\u0345l", "pl" : "Polski", "pt-PT" : "Portugu\u00eas (Europeu)", "ru" : "\u0420\u0443\u0441\u0441\u043a\u0438\u0439",

1 0

[torbutton/master] Bug 27129: Add locales ca, ga, id, is, nb
by gk＠torproject.org 15 Aug '18

15 Aug '18

commit 859160f4d23a2706c4cad689c5379a33b0070ef5 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Aug 13 14:35:33 2018 -0700 Bug 27129: Add locales ca, ga, id, is, nb --- trans_tools/import-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index 736d62ff..2f0be994 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -2,7 +2,7 @@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync -BUNDLE_LOCALES="ar bn-BD da de es fa fr he it ja ko nl pl pt-BR ru sv tr vi zh-CN zh-TW" +BUNDLE_LOCALES="ar bn-BD ca da de es fa fr ga he id is it ja ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" # XXX: Basque (eu) by request in #10687. # This is not used for official builds, but should remain

1 0

[torbutton/master] Bug 26960: implement new about:tor start page
by gk＠torproject.org 14 Aug '18

14 Aug '18

commit 985bcbf8323c159b18345fbfc010a7277d54559f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Jul 27 12:23:36 2018 -0400 Bug 26960: implement new about:tor start page Implement new design from UX team. Remove "update needed" notification (will be addressed by bug 25694). --- src/chrome/content/aboutTor/aboutTor-content.js | 222 +-------------- src/chrome/content/aboutTor/aboutTor.xhtml | 212 +++++++++----- src/chrome/content/torbutton.js | 63 +---- src/chrome/locale/en/aboutTor.dtd | 42 +-- src/chrome/locale/en/aboutTor.properties | 8 +- src/chrome/skin/aboutTor.css | 353 ++++++++++-------------- src/chrome/skin/forwardArrow.png | Bin 0 -> 258 bytes src/chrome/skin/onionArrow-extension.png | Bin 1798 -> 0 bytes src/chrome/skin/onionArrow-leftBend.png | Bin 2080 -> 0 bytes src/chrome/skin/onionArrow-rightBend.png | Bin 2077 -> 0 bytes src/chrome/skin/onionArrow-short.png | Bin 1913 -> 0 bytes src/chrome/skin/search.png | Bin 934 -> 0 bytes src/chrome/skin/searchLogo.png | Bin 0 -> 1912 bytes src/chrome/skin/tor-off.png | Bin 5835 -> 0 bytes src/chrome/skin/tor-on.png | Bin 17945 -> 0 bytes src/defaults/preferences/preferences.js | 1 - 16 files changed, 318 insertions(+), 583 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index 1a8d5cfa..c2e26c8c 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -12,8 +12,6 @@ * the code in torbutton.js: * AboutTor:Loaded page loaded content -> chrome * AboutTor:ChromeData privileged data chrome -> content - * AboutTor:GetToolbarData request toolbar info content -> chrome - * AboutTor:ToolbarData toolbar info chrome -> content */ var {classes: Cc, interfaces: Ci, utils: Cu} = Components; @@ -24,7 +22,8 @@ let { bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js", {}) var AboutTorListener = { - kAboutTorMessages: [ "AboutTor:ChromeData", "AboutTor:ToolbarData" ], + kAboutTorLoadedMessage: "AboutTor:Loaded", + kAboutTorChromeDataMessage: "AboutTor:ChromeData", get isAboutTor() { return content.document.documentURI.toLowerCase() == "about:tor"; @@ -45,9 +44,6 @@ var AboutTorListener = { case "pagehide": this.onPageHide(); break; - case "resize": - sendAsyncMessage("AboutTor:GetToolbarData"); - break; } }, @@ -56,12 +52,9 @@ var AboutTorListener = { return; switch (aMessage.name) { - case "AboutTor:ChromeData": + case this.kAboutTorChromeDataMessage: this.onChromeDataUpdate(aMessage.data); break; - case "AboutTor:ToolbarData": - this.onToolbarDataUpdate(aMessage.data); - break; } }, @@ -74,70 +67,42 @@ var AboutTorListener = { }); // Add message and event listeners. - this.kAboutTorMessages.forEach(aMsg => addMessageListener(aMsg, this)); - addMessageListener("AboutTor:ChromeData", this); + addMessageListener(this.kAboutTorChromeDataMessage, this); addEventListener("pagehide", this, false); addEventListener("resize", this, false); - sendAsyncMessage("AboutTor:Loaded"); + sendAsyncMessage(this.kAboutTorLoadedMessage); }, onPageHide: function() { removeEventListener("resize", this, false); removeEventListener("pagehide", this, false); - this.kAboutTorMessages.forEach(aMsg => removeMessageListener(aMsg, this)); + removeMessageListener(this.kAboutTorChromeDataMessage, this); }, onChromeDataUpdate: function(aData) { let body = content.document.body; - // Update status: tor on/off, update needed, Tor Browser manual shown. + // Update status: tor on/off, Tor Browser manual shown. if (aData.torOn) body.setAttribute("toron", "yes"); else body.removeAttribute("toron"); - if (aData.updateNeeded) - body.setAttribute("torNeedsUpdate", "yes"); - else - body.removeAttribute("torNeedsUpdate"); - if (aData.showManual) body.setAttribute("showmanual", "yes"); else body.removeAttribute("showmanual"); - // Setting body.initialized="yes" displays the body, which must be done - // at this point because our remaining initialization depends on elements - // being visible so that their size and position are accurate. + // Setting body.initialized="yes" displays the body. body.setAttribute("initialized", "yes"); - - let containerName = "torstatus-" + (aData.torOn ? "on" : "off") + - "-container"; - this.adjustFontSizes(containerName); - - this.onToolbarDataUpdate(aData); - }, - - onToolbarDataUpdate: function(aData) { - this.adjustArrow(aData.toolbarButtonXPos); }, onLocaleChange: function(aLocale) { - this.insertPropertyStrings(); - // Set Tor Browser manual link. content.document.getElementById("manualLink").href = "https://tb-manual.torproject.org/" + aLocale; - // Insert "Test Tor Network Settings" url. - let elem = content.document.getElementById("testTorSettings"); - if (elem) { - let url = Services.prefs.getCharPref( - "extensions.torbutton.test_url_interactive"); - elem.href = url.replace(/__LANG__/g, aLocale.replace(/-/g, '_')); - } - // Display the Tor Browser product name and version. try { const kBrandBundle = "chrome://branding/locale/brand.properties"; @@ -153,177 +118,6 @@ var AboutTorListener = { elem.appendChild(content.document.createTextNode(productName + '\n' + tbbVersion)); } catch (e) {} - }, - - insertPropertyStrings: function() { - try { - let kPropertiesURL = "chrome://torbutton/locale/aboutTor.properties"; - - let stringBundle = Services.strings.createBundle(kPropertiesURL); - let s1 = stringBundle.GetStringFromName("aboutTor.searchDDG.privacy.link"); - let s2 = stringBundle.GetStringFromName("aboutTor.searchDDG.search.link"); - let result = stringBundle.formatStringFromName( - "aboutTor.searchDDG.privacy", [s1, s2], 2); - if (result) { - let elem = content.document.getElementById("searchProviderInfo"); - if (elem) - elem.innerHTML = result; - } - } catch(e) {} - }, - - // Ensure that text in top area does not overlap the tor on/off (onion) image. - // This is done by reducing the font sizes as necessary. - adjustFontSizes: function(aContainerName) - { - let imgElem = content.document.getElementById("torstatus-image"); - let containerElem = content.document.getElementById(aContainerName); - if (!imgElem || !containerElem) - return; - - try - { - let imgRect = imgElem.getBoundingClientRect(); - - for (let textElem = containerElem.firstChild; textElem; - textElem = textElem.nextSibling) - { - if ((textElem.nodeType != textElem.ELEMENT_NODE) || - (textElem.nodeName.toLowerCase() == "br")) - { - continue; - } - - let textRect = textElem.getBoundingClientRect(); - if (0 == textRect.width) - continue; - - // Reduce font to 90% of previous size, repeating the process up to 7 - // times. This allows for a maximum reduction to just less than 50% of - // the original size. - let maxTries = 7; - while ((textRect.left < imgRect.right) && (--maxTries >= 0)) - { - let style = content.document.defaultView - .getComputedStyle(textElem, null); - let fontSize = parseFloat(style.getPropertyValue("font-size")); - textElem.style.fontSize = (fontSize * 0.9) + "px"; - textRect = textElem.getBoundingClientRect(); - } - } - - } catch (e) {} - }, - - adjustArrow: function(aToolbarButtonXPos) - { - let win = content; - let doc = content.document; - let textElem = doc.getElementById("updatePrompt"); - let arrowHeadDiv = doc.getElementById("toolbarIconArrowHead"); - let vertExtDiv = doc.getElementById("toolbarIconArrowVertExtension"); - let bendDiv = doc.getElementById("toolbarIconArrowBend"); - let horzExtDiv = doc.getElementById("toolbarIconArrowHorzExtension"); - if (!textElem || !arrowHeadDiv || !vertExtDiv || !bendDiv || !horzExtDiv) - return; - - let arrowTailElems = [ vertExtDiv, bendDiv, horzExtDiv ]; - if (!aToolbarButtonXPos || isNaN(aToolbarButtonXPos) || - (aToolbarButtonXPos < 0)) - { - arrowHeadDiv.style.display = "none"; - for (let elem of arrowTailElems) - elem.style.display = "none"; - return; - } - - const kArrowMargin = 6; // Horizontal margin between line and text. - const kArrowHeadExtraWidth = 9; // Horizontal margin to the line. - const kArrowLineThickness = 11; - const kBendWidth = 22; - const kBendHeight = 22; - - try { - // Compensate for any content zoom that may be in effect on about:tor. - // Because window.devicePixelRatio always returns 1.0 for non-Chrome - // windows (see bug 13875), we use screenPixelsPerCSSPixel for the - // content window. - let pixRatio = content.QueryInterface(Ci.nsIInterfaceRequestor) - .getInterface(Ci.nsIDOMWindowUtils) - .screenPixelsPerCSSPixel; - let tbXpos = Math.round(aToolbarButtonXPos / pixRatio); - - arrowHeadDiv.style.display = "block"; // Must be visible to get offsetWidth. - let arrowHalfWidth = Math.round(arrowHeadDiv.offsetWidth / 2); - let leftAnchor = textElem.offsetLeft - kArrowMargin - - kBendWidth + Math.round(kArrowLineThickness / 2); - let rightAnchor = textElem.offsetLeft + textElem.offsetWidth - + kArrowMargin + arrowHalfWidth; - - let isArrowOnLeft = (tbXpos < leftAnchor); - let isArrowOnRight = (tbXpos > rightAnchor) && - (tbXpos < (win.innerWidth - arrowHalfWidth)); - let isArrowInMiddle = (tbXpos >= leftAnchor) && (tbXpos <= rightAnchor); - - if (isArrowOnLeft || isArrowOnRight || isArrowInMiddle) - { - // Position the arrow head. - let arrowHeadLeft = tbXpos - arrowHalfWidth; - arrowHeadDiv.style.left = arrowHeadLeft + "px"; - if (isArrowOnLeft || isArrowOnRight) - { - let horzExtBottom = textElem.offsetTop + - Math.round((textElem.offsetHeight + kArrowLineThickness) / 2); - - // Position the vertical (extended) line. - let arrowHeadBottom = arrowHeadDiv.offsetTop + - arrowHeadDiv.offsetHeight; - vertExtDiv.style.top = arrowHeadBottom + "px"; - vertExtDiv.style.left = (arrowHeadLeft + kArrowHeadExtraWidth) + "px"; - let ht = horzExtBottom - kBendHeight - arrowHeadBottom; - vertExtDiv.style.height = ht + "px"; - - // Position the bend (elbow). - bendDiv.style.top = (horzExtBottom - kBendHeight) + "px"; - let bendDivLeft; - if (isArrowOnLeft) - { - bendDiv.setAttribute("pos", "left"); - bendDivLeft = arrowHeadLeft + kArrowHeadExtraWidth; - } - else if (isArrowOnRight) - { - bendDiv.setAttribute("pos", "right"); - bendDivLeft = arrowHeadLeft + kArrowHeadExtraWidth - + kArrowLineThickness - kBendWidth; - } - bendDiv.style.left = bendDivLeft + "px"; - - // Position the horizontal (extended) line. - horzExtDiv.style.top = (horzExtBottom - kArrowLineThickness) + "px"; - let horzExtLeft, w; - if (isArrowOnLeft) - { - horzExtLeft = bendDivLeft + kBendWidth; - w = (textElem.offsetLeft - horzExtLeft - kArrowMargin); - } - else - { - horzExtLeft = rightAnchor - arrowHalfWidth; - w = tbXpos - arrowHalfWidth - horzExtLeft; - } - horzExtDiv.style.left = horzExtLeft + "px"; - horzExtDiv.style.width = w + "px"; - } - } - - let headDisplay = (isArrowOnLeft || isArrowInMiddle || isArrowOnRight) - ? "block" : "none"; - arrowHeadDiv.style.display = headDisplay; - let tailDisplay = (isArrowOnLeft || isArrowOnRight) ? "block" : "none"; - for (let elem of arrowTailElems) - elem.style.display = tailDisplay; - } catch (e) {} } }; diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 5cb2a605..c2bbcb25 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -31,87 +31,173 @@ window.addEventListener("pageshow", function() { </script> </head> <body dir="&locale.dir;"> - <div class="hideIfTorIsUpToDate"> - <div id="toolbarIconArrowHead" class="arrow"/> - <div id="toolbarIconArrowVertExtension" class="arrow"/> - <div id="toolbarIconArrowBend" class="arrow"/> - <div id="toolbarIconArrowHorzExtension" class="arrow"/> - </div> <div class="torcontent-container"> <div id="torstatus-version"/> <div id="torstatus" class="top"> - <div id="torstatus-image"/> <div id="torstatus-on-container" class="hideIfTorOff torstatus-container"> - <h1>&aboutTor.success.label;</h1> - <br/> - <h3 class="hideIfTBBNeedsUpdate">&aboutTor.success3.label;</h3> + <div class="heading1">&aboutTor.ready.label;</div> <br/> - <div style="margin-top: 20px;"> - <a id="testTorSettings" href="about:blank">&aboutTor.check.label;</a> - </div> + <div class="heading2">&aboutTor.ready2.label;</div> </div> <div id="torstatus-off-container" class="hideIfTorOn torstatus-container"> - <h1>&aboutTor.failure.label;</h1> + <div class="heading1">&aboutTor.failure.label;</div> <br/> - <h2>&aboutTor.failure2.label;</h2> - </div> - </div> - <div class="top"> - <div class="hideIfTorIsUpToDate"> - <h1 class="hideIfTorOff">&aboutTor.outOfDateTorOn.label;</h1> - <h1 class="hideIfTorOn">&aboutTor.outOfDateTorOff.label;</h1> - <div> - <h3 id="updatePrompt">&aboutTor.outOfDate2.label;</h3> - </div> + <div class="heading2">&aboutTor.failure2.label;</div> </div> </div> <div class="searchbox hideIfTorOff">  <form action="&aboutTor.searchDDGPost.link;" method="post"> - <div id="sxw"> - <div id="sbutton"> - <input name="b" id="sb" value="" title="&aboutTor.search.label;" - alt="&aboutTor.search.label;" type="submit"/> + <div class="searchwrapper"> + <label class="searchlabel" for="search-text"> </label> + <input name="q" id="search-text" placeholder="&aboutTor.search.label;" + autocomplete="off" type="text"/> + <input name="b" id="search-button" value="" + title="&aboutTor.search.label;" + alt="&aboutTor.search.label;" type="submit"/> </div> - <input name="q" autocomplete="off" id="sx" type="text"/> - </div> - <h4 id="searchProviderInfo" /> </form> </div> - <div class="hideIfTorOn" style="height:100px"/> - - <div id="middle" class="hideIfTorOff"> - <div class="bubble"> - <h1>&aboutTor.whatnextQuestion.label;</h1> - <p>&aboutTor.whatnextAnswer.label;</p> - <ul> - <li> - <a href="&aboutTor.whatnext.link;"> - &aboutTor.whatnext.label; - </a> - </li> - <li class="showForManual"> - <a id="manualLink"> - &aboutTor.torbrowser_user_manual.label; » - </a> - </li> - </ul> - </div> - <div class="bubble"> - <h1>&aboutTor.helpInfo1.label;</h1> - <p>&aboutTor.helpInfo2.label;</p> - <ul> - <li><a href="&aboutTor.helpInfo3.link;">&aboutTor.helpInfo3.label;</a></li> - <li><a href="&aboutTor.helpInfo4.link;">&aboutTor.helpInfo4.label;</a></li> - <li><a href="&aboutTor.helpInfo5.link;">&aboutTor.helpInfo5.label;</a></li> - </ul> - </div> - </div>  - <div id="bottom"> - <p>&aboutTor.footer.label; - <a href="&aboutTor.learnMore.link;">&aboutTor.learnMore.label;</a></p> + <p class="showForManual moreInfoLink">&aboutTor.torbrowser_user_manual_questions.label; + <a id="manualLink">&aboutTor.torbrowser_user_manual_link.label;</a></p> + <p>&aboutTor.tor_mission.label; + <a href="&aboutTor.getInvolved.link;">&aboutTor.getInvolved.label;</a></p> + </div> + </div> + + + <div class="onion-pattern-container"> + <div class="onion-pattern-row"> + <div class="circle solid"></div> + + <div class="circle border"></div> + + <div class="circle border"> + <div class="inner border"></div> + <div class="inner border"></div> + <div class="inner border"></div> + </div> + + <div class="circle"> + <div class="half solid"></div> + <div class="half dotted"></div> + </div> + + <div class="circle dotted"></div> + + <div class="circle dotted"> + <div class="inner dotted"></div> + <div class="inner dotted"></div> + <div class="inner dotted"></div> + </div> + + <div class="circle dashed"></div> + + <div class="circle dashed"> + <div class="inner dashed"></div> + <div class="inner dashed"></div> + <div class="inner dashed"></div> + </div> + + <div class="circle bold"></div> + + <div class="circle solid"></div> + + <div class="circle dotted"> + <div class="inner dotted"></div> + <div class="inner dotted"></div> + <div class="inner dotted"></div> + </div> + + <div class="circle border"> + <div class="inner border"></div> + <div class="inner border"></div> + <div class="inner border"></div> + </div> + + <div class="circle"> + <div class="half solid"></div> + <div class="half solid"></div> + </div> + + <div class="circle dashed"> + <div class="inner dashed"></div> + <div class="inner dashed"></div> + <div class="inner dashed"></div> + </div> + </div> + + <div class="onion-pattern-row onion-pattern-offset-row"> + <div class="circle dashed"> + <div class="inner dashed"></div> + <div class="inner dashed"></div> + <div class="inner dashed"></div> + </div> + + <div class="circle bold"></div> + + <div class="circle solid"></div> + + <div class="circle dotted"> + <div class="inner dotted"></div> + <div class="inner dotted"></div> + <div class="inner dotted"></div> + </div> + + <div class="circle border"> + <div class="inner border"></div> + <div class="inner border"></div> + <div class="inner border"></div> + </div> + + <div class="circle"> + <div class="half solid"></div> + <div class="half solid"></div> + </div> + + <div class="circle dashed"> + <div class="inner dashed"></div> + <div class="inner dashed"></div> + <div class="inner dashed"></div> + </div> + + <div class="circle solid"></div> + + <div class="circle border"></div> + + <div class="circle border"> + <div class="inner border"></div> + <div class="inner border"></div> + <div class="inner border"></div> + </div> + + <div class="circle"> + <div class="half solid"></div> + <div class="half dotted"></div> + </div> + + <div class="circle dotted"></div> + + <div class="circle dotted"> + <div class="inner dotted"></div> + <div class="inner dotted"></div> + <div class="inner dotted"></div> + </div> + + <div class="circle dashed"></div> </div> </div> </body> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index d0195b46..8e62a5ab 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -338,10 +338,9 @@ function torbutton_init() { } } - // Add about:tor IPC message listeners. - let aboutTorMessages = [ "AboutTor:Loaded", "AboutTor:GetToolbarData" ]; - aboutTorMessages.forEach(aMsg => window.messageManager.addMessageListener( - aMsg, torbutton_abouttor_message_handler)); + // Add about:tor IPC message listener. + window.messageManager.addMessageListener("AboutTor:Loaded", + torbutton_abouttor_message_handler); // XXX: Get rid of the cached asmjs (or IndexedDB) files on disk in case we // don't allow things saved to disk. This is an ad-hoc fix to work around @@ -369,11 +368,6 @@ function torbutton_init() { torbutton_log(1, "registering Tor check observer"); torbutton_tor_check_observer.register(); - // Detect toolbar customization and update arrow on about:tor pages. - window.addEventListener("aftercustomization", function() { - torbutton_abouttor_message_handler.updateAllOpenPages(); - }, false); - //setting up context menu //var contextMenu = document.getElementById("contentAreaContextMenu"); //if (contextMenu) @@ -425,10 +419,6 @@ var torbutton_abouttor_message_handler = { aMessage.target.messageManager.sendAsyncMessage("AboutTor:ChromeData", this.chromeData); break; - case "AboutTor:GetToolbarData": - aMessage.target.messageManager.sendAsyncMessage("AboutTor:ToolbarData", - this.toolbarData); - break; } }, @@ -441,23 +431,12 @@ var torbutton_abouttor_message_handler = { // The chrome data contains all of the data needed by the about:tor // content process that is only available here (in the chrome process). // It is sent to the content process when an about:tor window is opened - // and in response to events such as the browser noticing that an update - // is available. + // and in response to events such as the browser noticing that Tor is + // not working. get chromeData() { return { torOn: torbutton_tor_check_ok(), - updateNeeded: torbutton_update_is_needed(), - showManual: torbutton_show_torbrowser_manual(), - toolbarButtonXPos: torbutton_get_toolbarbutton_xpos() - }; - }, - - // The toolbar data only contains the x coordinate of Torbutton's toolbar - // item; it is sent back to the content process as the about:tor window - // is resized. - get toolbarData() { - return { - toolbarButtonXPos: torbutton_get_toolbarbutton_xpos() + showManual: torbutton_show_torbrowser_manual() }; } }; @@ -593,9 +572,6 @@ function torbutton_notify_if_update_needed() { var btn = torbutton_get_toolbutton(); setOrClearAttribute(btn, "tbUpdateNeeded", updateNeeded); - // Update all open about:tor pages. - torbutton_abouttor_message_handler.updateAllOpenPages(); - // Make the "check for update" menu item bold if an update is needed. var item = document.getElementById("torbutton-checkForUpdate"); setOrClearAttribute(item, "tbUpdateNeeded", updateNeeded); @@ -621,33 +597,6 @@ function torbutton_check_for_update() { prompter.checkForUpdates(); } -// Determine X position of Torbutton toolbar item. The value returned -// accounts for retina but not content zoom. -// undefined is returned if the value cannot be determined (e.g., if the -// toolbar item is not on the toolbar). -function torbutton_get_toolbarbutton_xpos() { - try { - let tbXpos = -1; - let tbItem = torbutton_get_toolbutton(); - if (tbItem) { - let tbItemRect = tbItem.getBoundingClientRect(); - let contentElem = document.getElementById("tabbrowser-initialBrowser"); - let contentRect = contentElem.getBoundingClientRect(); - if (tbItemRect.top < contentRect.top) { - tbXpos = tbItemRect.left + (tbItemRect.width / 2.0) - contentRect.left; - } - } - - if (tbXpos >= 0) { - // Convert to device-independent units, compensating for retina display. - tbXpos *= window.devicePixelRatio; - return tbXpos; - } - } catch(e) {} - - return undefined; -} - function torbutton_show_sec_slider_notification() { // Show the notification about the new security slider. if (m_tb_prefs. diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd index 676878e2..3eecc0bc 100644 --- a/src/chrome/locale/en/aboutTor.dtd +++ b/src/chrome/locale/en/aboutTor.dtd @@ -1,45 +1,25 @@  <!ENTITY aboutTor.title "About Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update."> - -<!ENTITY aboutTor.check.label "Test Tor Network Settings"> - -<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> -<!ENTITY aboutTor.success2.label "Connected to the Tor network."> -<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously."> +<!ENTITY aboutTor.ready.label "Explore. Privately."> +<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> <!ENTITY aboutTor.failure.label "Something Went Wrong!"> <!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> -<!ENTITY aboutTor.search.label "Search"> +<!ENTITY aboutTor.search.label "Search with DuckDuckGo"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> -<!ENTITY aboutTor.torInfo1.label "Additional Info:"> -<!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> -<!ENTITY aboutTor.torInfo3.label "Exit Node:"> -<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> -<!ENTITY aboutTor.whatnextQuestion.label "What Next?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> -<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »"> -<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Questions?"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »"> + <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual"> -<!ENTITY aboutTor.helpInfo1.label "You Can Help!"> -<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> -<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »"> -<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »"> -<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Make a Donation »"> -<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual"> -<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> -<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »"> -<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> +<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> +<!ENTITY aboutTor.getInvolved.label "Get Involved »"> +<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> diff --git a/src/chrome/locale/en/aboutTor.properties b/src/chrome/locale/en/aboutTor.properties index d0d3a64b..375c0da1 100644 --- a/src/chrome/locale/en/aboutTor.properties +++ b/src/chrome/locale/en/aboutTor.properties @@ -1,13 +1,7 @@ -# Copyright (c) 2014, 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: -aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. -# The following string is a link which replaces %1$S above. -aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html -# The following string is a link which replaces %2$S above. -aboutTor.searchDDG.search.link=https://duckduckgo.com/ - aboutTor.donationBanner.donate=Donate Now! aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 62c9256c..02a81744 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -5,6 +5,12 @@ * vim: set sw=2 sts=2 ts=8 et syntax=css: */ +:root { + --abouttor-text-color: white; + --abouttor-bg-toron-color: #420C5D; + --abouttor-bg-toroff-color: #A4000F; +} + * { padding: 0px; margin: 0px; @@ -15,21 +21,15 @@ body { height: 100%; margin: 0px auto; padding: 0px 0px; - font-size: 62.5%; - font-family: "Liberation Sans", Arial, Helvetica, sans-serif; - font-weight: normal; - color: #4d4d4d; - background-color: #FFFFFF; + font-family: Helvetica, Arial, sans-serif; + color: var(--abouttor-text-color); + background-color: var(--abouttor-bg-toroff-color); background-attachment: fixed; background-size: 100% 100%; } -body { - background-image: linear-gradient(to bottom, #ffffff, #ffffff 10%, #dddddd 50%, #dddddd); -} - body[toron] { - background-image: linear-gradient(to bottom, #ffffff, #ffffff 10%, #d5ffd5 50%, #d5ffd5); + background-color: var(--abouttor-bg-toron-color); } /* Hide the entire document by default to avoid showing the incorrect @@ -42,88 +42,44 @@ body:not([initialized]) { } .torcontent-container { - margin: 40px 20px; + margin: 40px 20px 28px 20px; display: flex; flex-direction: column; } +@media only screen and (min-width: 900px) { + .torcontent-container { + margin: 40px auto 28px auto; + max-width: 1000px; + min-width: 1000px; + } +} + #torstatus-version { position: absolute; top: 6px; right: 6px; height: 30px; width: 200px; - font-size: 1.4em; + font-size: 15px; white-space: pre-wrap; text-align: right; } -body[toron] #torstatus-image { - background-image: url('chrome://torbutton/skin/tor-on.png'); -} - -#torstatus-image { - display: none; - position: absolute; - left: 85px; - height: 128px; - width: 128px; - background-image: url('chrome://torbutton/skin/tor-off.png'); - background-repeat: no-repeat; - background-position: center; - z-index: -1; -} - -.arrow { - display: none; - position: absolute; - z-index: -1; -} - -#toolbarIconArrowHead { - top: 4px; - width: 30px; - height: 36px; - background-image: url('chrome://torbutton/skin/onionArrow-short.png'); -} - -#toolbarIconArrowVertExtension, #toolbarIconArrowHorzExtension { - width: 11px; - height: 11px; - background-image: url('chrome://torbutton/skin/onionArrow-extension.png'); -} - -#toolbarIconArrowBend { - width: 22px; - height: 22px; - background-image: url('chrome://torbutton/skin/onionArrow-leftBend.png'); -} - -#toolbarIconArrowBend[pos="right"] { - background-image: url('chrome://torbutton/skin/onionArrow-rightBend.png'); -} - a { - color: #008000; - text-decoration: none; -} - -a:hover { - color: #00A000; - text-decoration: underline; -} - -#testTorSettings { - font-size: 1.6em; - text-decoration: underline; - margin-bottom: 5px; + color: var(--abouttor-text-color); } #torstatus { - position: relative; /* needed for torstatus-image positioning */ + margin-top: 135px; display: flex; justify-content: center; - min-height: 148px; + vertical-align: bottom; + min-height: 92px; +} + +#torstatus > div { + align-self: flex-end; /* align text to bottom of container */ } .top { @@ -134,206 +90,183 @@ a:hover { text-align: center; } -body[toron][torNeedsUpdate] .hideIfTBBNeedsUpdate, -body:not([torNeedsUpdate]) .hideIfTorIsUpToDate { - display: none; -} - body[toron] .hideIfTorOn, body:not([toron]) .hideIfTorOff { display: none; } -body[toron] .top h1 { - color: #600060; -} - body:not([showmanual]) .showForManual { display: none; } -div.hideIfTorIsUpToDate { - display: flex; - flex-direction: column; -} - -div.hideIfTorIsUpToDate, -body .top div.hideIfTorIsUpToDate h1 { - color: black; - text-align: center; -} - -/* Use inline-block for text-oriented elements whose widths need to measured. */ -.torstatus-container *, -.top div.hideIfTorIsUpToDate h3 { - display: inline-block; +.torstatus-container * { text-align: center; } -.top div.hideIfTorOff h1 { +.top div.hideIfTorOff .heading1 { margin-top: 20px; } -.top h1 { - font-size: 4.00em; - font-weight: bold; +.top .heading1 { + font-size: 50px; + font-weight: 300; margin-bottom: 5px; } -.top h2 { - font-size: 2.934em; +.top .heading2 { + font-size: 15px; margin-bottom: 20px; - font-weight: normal; } -.top h3 { - font-size: 1.8em; - font-weight: normal; - color: #3B503C; +#bottom { + margin-top: 170px; } -#middle { - display: flex; - flex-flow: row wrap; - font-size: 1.6em; - justify-content: space-evenly; - margin-top: 40px; +#bottom p { + font-size: 10px; + text-align: start; + margin: auto; + padding-bottom: 20px; } -.bubble { - width: 242px; - padding: 20px 30px; - color: #3B503C; - background-color: #FFFFFF; - border: none; - border-radius: 16px; - margin-bottom: 40px; - text-align: start; - vertical-align: top; +@media only screen and (min-width: 900px) { + #bottom p { + margin: 0px 135px 0px 135px; + } } -#middle h1 { - font-size: 1.2em; - margin-bottom: 10px; +#bottom p:last-child { + padding-bottom: 0px; } -#middle ul { - padding: 5px 0 0 22px; +#bottom p.moreInfoLink { + font-size: 15px; } -#middle ul:dir(rtl) { - padding: 5px 22px 0 0; +.searchbox form { + width: 500px; + margin: 39px auto 0px auto; + text-align: left; } -#middle li { - padding-top: 2px; +@media only screen and (max-width: 540px) { + .searchbox form { + width: auto; + } } -#bottom { - padding-bottom: 40px; +.searchwrapper { + display: flex; + height: 46px; + border: 1px solid black; + border-radius: 8px; + background-color: white; } -#bottom p { - font-size: 1.6em; - text-align: start; - margin: auto; +.searchlabel { + height: auto; + width: 50px; + display: inline-block; + background: url('chrome://torbutton/skin/searchLogo.png') no-repeat center center; + background-size: 30px 30px; } -#bottom a { - color: #800080; - text-decoration: underline; +#search-button { + height: auto; + width: 36px; + border: 0; + background: url('chrome://torbutton/skin/forwardArrow.png') no-repeat center center; + background-size: 16px 14px; + cursor: pointer; } -#bottom a:hover { - color: #A000A0; - text-decoration: none; +#search-button:hover { + background-color: rgba(12, 12, 13, 0.1); /* same as Firefox's about:home */ } -#bottom h4 { - margin-top: 50px; - line-height: 1em; - font-size: 1em; - font-weight: normal; - text-align: center; +/* #search-text is the search input field */ +#search-text { + flex: 1; + border: none; + padding: 4px 2px 5px 2px; + margin: 0; + font-size: 15px; } -#bottom p.lang { - max-width: 620px; - margin: 10px auto; - font-size: 1em; - font-weight: normal; - text-align: center; +.onion-pattern-container { + margin: 0px auto; + width: 100%; + max-width: 1624px; /* room for 14 of the widest circles */ + overflow: hidden; } -.searchbox form { - width: 396px; - margin: 35px auto 1px auto; - text-align: left; +.onion-pattern-row { + width: 1624px; + display: flex; + flex-direction: row; + position: relative; } -.searchbox h4 { - padding-top: 5px; - font-size: 12px; - font-weight: normal; - text-align: center; +.onion-pattern-offset-row { + left: -40px; } -#sbutton { - display: block; - float: right; - width: 33px; +/* With borders, circles range in size from 100 x 100px to 116 x 116px. */ +.circle { + opacity: 0.2; + position: relative; + width: 100px; + height: 100px; + border-radius: 50%; } -#sbutton input { - height: 34px; - width: 33px; - border: 0; - background: url('chrome://torbutton/skin/search.png') no-repeat top left; - cursor: pointer; +.inner { + position: absolute; } -/* #sxw is the container div for the search field and button */ -#sxw { - border: none; +.inner:nth-child(1){ + transform: translate(calc(12.5% - 2px),calc(12.5% - 2px)); + width: calc(100% * 0.75); + height: calc(100% * 0.75); + border-radius: 50%; } -/* #sx is the search input (text) field */ -#sx { - border-color: lightgray; - border-style: solid; - border-width: 1px 0px 1px 1px; - width: 350px; - min-height: 23px; - padding: 4px 6px 5px 6px; - margin: 0; - outline: none; - color: #222; - font-size: 18px; +.inner:nth-child(2){ + transform: translate(calc(40% - 2px),calc(40% - 2px)); + width: calc(100% * 0.5); + height: calc(100% * 0.5); + border-radius: 50%; } -@media only screen and (min-width : 820px) { -.torcontent-container { - margin: auto; - margin-top: 40px; - max-width: 920px; - min-width: 920px; - } +.inner:nth-child(3){ + transform: translate(calc(108% - 2px),calc(108% - 2px)); + width: calc(100% * 0.25); + height: calc(100% * 0.25); + border-radius: 50%; +} - #torstatus-image { - display: block; - } +.solid { + background-color: #fff; +} - #bottom p { - margin: 10px 125px 0px 125px; - } +.border { + border: 4px solid #fff; } -@media only screen and (max-width : 436px) { - .searchbox form { - width: auto; - } +.dashed { + border: 4px dashed #fff; +} - #sx { - width: calc(100% - 46px); - } +.dotted { + border: 4px dotted #fff; +} + +.bold { + border: 8px solid #fff; +} + +.half { + width: 100px; + height: 50px; + border-radius: 50px 50px 0 0; } diff --git a/src/chrome/skin/forwardArrow.png b/src/chrome/skin/forwardArrow.png new file mode 100644 index 00000000..ceea950f Binary files /dev/null and b/src/chrome/skin/forwardArrow.png differ diff --git a/src/chrome/skin/onionArrow-extension.png b/src/chrome/skin/onionArrow-extension.png deleted file mode 100644 index 55ff2084..00000000 Binary files a/src/chrome/skin/onionArrow-extension.png and /dev/null differ diff --git a/src/chrome/skin/onionArrow-leftBend.png b/src/chrome/skin/onionArrow-leftBend.png deleted file mode 100644 index 9d1bb456..00000000 Binary files a/src/chrome/skin/onionArrow-leftBend.png and /dev/null differ diff --git a/src/chrome/skin/onionArrow-rightBend.png b/src/chrome/skin/onionArrow-rightBend.png deleted file mode 100644 index 6b60342d..00000000 Binary files a/src/chrome/skin/onionArrow-rightBend.png and /dev/null differ diff --git a/src/chrome/skin/onionArrow-short.png b/src/chrome/skin/onionArrow-short.png deleted file mode 100644 index 23e5a20e..00000000 Binary files a/src/chrome/skin/onionArrow-short.png and /dev/null differ diff --git a/src/chrome/skin/search.png b/src/chrome/skin/search.png deleted file mode 100644 index 698a77df..00000000 Binary files a/src/chrome/skin/search.png and /dev/null differ diff --git a/src/chrome/skin/searchLogo.png b/src/chrome/skin/searchLogo.png new file mode 100644 index 00000000..98ae319e Binary files /dev/null and b/src/chrome/skin/searchLogo.png differ diff --git a/src/chrome/skin/tor-off.png b/src/chrome/skin/tor-off.png deleted file mode 100644 index a4509ba5..00000000 Binary files a/src/chrome/skin/tor-off.png and /dev/null differ diff --git a/src/chrome/skin/tor-on.png b/src/chrome/skin/tor-on.png deleted file mode 100644 index 186fcf15..00000000 Binary files a/src/chrome/skin/tor-on.png and /dev/null differ diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index ab9b4bf4..43401ad0 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -10,7 +10,6 @@ pref("extensions.torbutton.updateNeeded", false); // Tor check and proxy prefs pref("extensions.torbutton.test_enabled",true); pref("extensions.torbutton.test_url","https://check.torproject.org/?TorButton=true"); -pref("extensions.torbutton.test_url_interactive", "https://check.torproject.org/?lang=__LANG__"); pref("extensions.torbutton.local_tor_check",true); pref("extensions.torbutton.versioncheck_url","https://www.torproject.org/projects/torbrowser/RecommendedTBBVersions"); pref("extensions.torbutton.versioncheck_enabled",true);

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 26514 - intermittent updater failures on Win64 (Error 19)
by gk＠torproject.org 14 Aug '18

14 Aug '18

commit c2720b2274e51eb76b91e5f6a5f2a82bdfaf8013 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Aug 13 12:13:40 2018 -0400 Bug 26514 - intermittent updater failures on Win64 (Error 19) Avoid MinGW's _ftelli64() and _fseeki64() implementations because they are unreliable. --- modules/libmar/src/mar_private.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/libmar/src/mar_private.h b/modules/libmar/src/mar_private.h index e0c263271ed0..358026fbcf50 100644 --- a/modules/libmar/src/mar_private.h +++ b/modules/libmar/src/mar_private.h @@ -55,8 +55,15 @@ MOZ_STATIC_ASSERT(sizeof(BLOCKSIZE) < \ instead of the NSPR equivalents. */ #ifdef XP_WIN #include <winsock2.h> +#ifdef __MINGW32__ +/* Avoid MinGW's _ftelli64() and _fseeki64() implementations because they + * are unreliable. See bug #26514. */ +#define ftello ftello64 +#define fseeko fseeko64 +#else #define ftello _ftelli64 #define fseeko _fseeki64 +#endif #else #define _FILE_OFFSET_BITS 64 #include <netinet/in.h>

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 1470156 - Part 1: Adding a test case for reassuring mozilla::OriginAttributes::CreateSuffix won't be crashed with invalid characters in firstParty domain. r=baku, mixedpuppy
by gk＠torproject.org 13 Aug '18

13 Aug '18

commit 82446eff1db658db8dae23443deac036b164b769 Author: Tim Huang <tihuang(a)mozilla.com> Date: Tue Jul 3 13:48:18 2018 +0000 Bug 1470156 - Part 1: Adding a test case for reassuring mozilla::OriginAttributes::CreateSuffix won't be crashed with invalid characters in firstParty domain. r=baku,mixedpuppy Differential Revision: https://phabricator.services.mozilla.com/D1845 --HG-- extra : moz-landing-system : lando --- .../mochitest/test_ext_cookies_first_party.html | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/toolkit/components/extensions/test/mochitest/test_ext_cookies_first_party.html b/toolkit/components/extensions/test/mochitest/test_ext_cookies_first_party.html index 64785c45e440..b214148824bd 100644 --- a/toolkit/components/extensions/test/mochitest/test_ext_cookies_first_party.html +++ b/toolkit/components/extensions/test/mochitest/test_ext_cookies_first_party.html @@ -10,6 +10,8 @@ async function background() { const url = "http://ext-cookie-first-party.mochi.test/"; const firstPartyDomain = "ext-cookie-first-party.mochi.test"; + // A first party domain with invalid characters for the file system, which just happens to be a IPv6 address. + const firstPartyDomainInvalidChars = "[2606:4700:4700::1111]"; const expectedError = "First-Party Isolation is enabled, but the required 'firstPartyDomain' attribute was not set."; const assertExpectedCookies = (expected, cookies, message) => { @@ -154,6 +156,38 @@ async function background() { browser.test.sendMessage("test_fpi_enabled"); }; + // Test FPI with a first party domain with invalid characters for + // the file system. + const test_fpi_with_invalid_characters = async () => { + let cookie; + + // Test setting a cookie with a first party domain with invalid characters + // for the file system. + cookie = await browser.cookies.set({url, name: "foo5", value: "bar5", + firstPartyDomain: firstPartyDomainInvalidChars}); + assertExpectedCookies([ + {name: "foo5", value: "bar5", firstPartyDomain: firstPartyDomainInvalidChars}, + ], [cookie], "set: FPI on, w/ firstPartyDomain with invalid characters, FP cookie"); + + // Test getting a cookie with a first party domain with invalid characters + // for the file system. + cookie = await browser.cookies.get({url, name: "foo5", + firstPartyDomain: firstPartyDomainInvalidChars}); + assertExpectedCookies([ + {name: "foo5", value: "bar5", firstPartyDomain: firstPartyDomainInvalidChars}, + ], [cookie], "get: FPI on, w/ firstPartyDomain with invalid characters, FP cookie"); + + // Test removing a cookie with a first party domain with invalid characters + // for the file system. + cookie = await browser.cookies.remove({url, name: "foo5", + firstPartyDomain: firstPartyDomainInvalidChars}); + assertExpectedCookies([ + {url, name: "foo5", firstPartyDomain: firstPartyDomainInvalidChars}, + ], [cookie], "remove: FPI on, w/ firstPartyDomain with invalid characters, FP cookie"); + + browser.test.sendMessage("test_fpi_with_invalid_characters"); + }; + // Test when FPI is disabled again, accessing FP cookies set when FPI is enabled. const test_fpd_cookies_on_fpi_disabled = async () => { let cookie, cookies; @@ -179,6 +213,7 @@ async function background() { switch (message) { case "test_fpi_disabled": return test_fpi_disabled(); case "test_fpi_enabled": return test_fpi_enabled(); + case "test_fpi_with_invalid_characters": return test_fpi_with_invalid_characters(); case "test_fpd_cookies_on_fpi_disabled": return test_fpd_cookies_on_fpi_disabled(); default: return browser.test.notifyFail("unknown-message"); } @@ -210,6 +245,8 @@ add_task(async () => { await enableFirstPartyIsolation(); extension.sendMessage("test_fpi_enabled"); await extension.awaitMessage("test_fpi_enabled"); + extension.sendMessage("test_fpi_with_invalid_characters"); + await extension.awaitMessage("test_fpi_with_invalid_characters"); await disableFirstPartyIsolation(); extension.sendMessage("test_fpd_cookies_on_fpi_disabled"); await extension.awaitMessage("test_fpd_cookies_on_fpi_disabled");

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 1470156 - Part 2: Fixing the crashing problem when using an invalid character in a firstPartyDomain. r=baku
by gk＠torproject.org 13 Aug '18

13 Aug '18

commit 7d9decc785bdc42443ee9835e0244f082d6911fb Author: Tim Huang <tihuang(a)mozilla.com> Date: Tue Jul 3 13:47:45 2018 +0000 Bug 1470156 - Part 2: Fixing the crashing problem when using an invalid character in a firstPartyDomain. r=baku This patch adds a sanitization of firstPartyDomain when calling the OriginAttributes::CreateSuffix() and remove the release assert there. The cookies API for the web extension can use a arbitrary string for the firstPartyDomain. So, we should sanitize the firstPartyDomain before we creating a suffix. The release assert is not required anymore since the firstPartyDomain is sanitized Depends on D1845. Differential Revision: https://phabricator.services.mozilla.com/D1856 --HG-- extra : moz-landing-system : lando --- caps/OriginAttributes.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/caps/OriginAttributes.cpp b/caps/OriginAttributes.cpp index ea3d7e507f3f..21092e46fb74 100644 --- a/caps/OriginAttributes.cpp +++ b/caps/OriginAttributes.cpp @@ -151,8 +151,10 @@ OriginAttributes::CreateSuffix(nsACString& aStr) const } if (!mFirstPartyDomain.IsEmpty()) { - MOZ_RELEASE_ASSERT(mFirstPartyDomain.FindCharInSet(dom::quota::QuotaManager::kReplaceChars) == kNotFound); - params.Set(NS_LITERAL_STRING("firstPartyDomain"), mFirstPartyDomain); + nsAutoString sanitizedFirstPartyDomain(mFirstPartyDomain); + sanitizedFirstPartyDomain.ReplaceChar(dom::quota::QuotaManager::kReplaceChars, '+'); + + params.Set(NS_LITERAL_STRING("firstPartyDomain"), sanitizedFirstPartyDomain); } aStr.Truncate();

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 1473247 - Part 1: Fixing the issue that the IP addresses won't be set for first party domains. r=arthuredelstein, baku
by gk＠torproject.org 13 Aug '18

13 Aug '18

commit a8a7f63745d822670462bde4c8db8cbb2ccc397c Author: Tim Huang <tihuang(a)mozilla.com> Date: Fri Jul 13 19:53:15 2018 +0000 Bug 1473247 - Part 1: Fixing the issue that the IP addresses won't be set for first party domains. r=arthuredelstein,baku Right now, the firstPartyDomain won't be set when using IP addresses as first party domains. It is because of that the TLD service won't accept IP addresses as valid hosts. The patch fixes this problem by detecting that if the host is a IP address. If it is, we will still set the firstPartyDoamin with the IP address. Differential Revision: https://phabricator.services.mozilla.com/D1977 --HG-- extra : moz-landing-system : lando --- caps/OriginAttributes.cpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/caps/OriginAttributes.cpp b/caps/OriginAttributes.cpp index 3d9c3f9bda78..ea3d7e507f3f 100644 --- a/caps/OriginAttributes.cpp +++ b/caps/OriginAttributes.cpp @@ -11,6 +11,7 @@ #include "nsIEffectiveTLDService.h" #include "nsIURI.h" #include "nsIURIWithPrincipal.h" +#include "nsURLHelper.h" namespace mozilla { @@ -58,6 +59,28 @@ OriginAttributes::SetFirstPartyDomain(const bool aIsTopLevelDocument, return; } + if (rv == NS_ERROR_HOST_IS_IP_ADDRESS) { + // If the host is an IPv4/IPv6 address, we still accept it as a + // valid firstPartyDomain. + nsAutoCString ipAddr; + rv = aURI->GetHost(ipAddr); + NS_ENSURE_SUCCESS_VOID(rv); + + if (net_IsValidIPv6Addr(ipAddr.BeginReading(), ipAddr.Length())) { + // According to RFC2732, the host of an IPv6 address should be an + // IPv6reference. The GetHost() of nsIURI will only return the IPv6 + // address. So, we need to convert it back to IPv6reference here. + mFirstPartyDomain.Truncate(); + mFirstPartyDomain.AssignLiteral("["); + mFirstPartyDomain.Append(NS_ConvertUTF8toUTF16(ipAddr)); + mFirstPartyDomain.AppendLiteral("]"); + } else { + mFirstPartyDomain = NS_ConvertUTF8toUTF16(ipAddr); + } + + return; + } + nsAutoCString scheme; rv = aURI->GetScheme(scheme); NS_ENSURE_SUCCESS_VOID(rv);

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 1473247 - Part 2: Add a test case for making sure that IP addresses can work properly for the firstPartyDomain. r=arthuredelstein, baku
by gk＠torproject.org 13 Aug '18

13 Aug '18

commit a75945d96b2d8903a86ac1c9016a8d300028b79f Author: Tim Huang <tihuang(a)mozilla.com> Date: Fri Jul 13 19:55:02 2018 +0000 Bug 1473247 - Part 2: Add a test case for making sure that IP addresses can work properly for the firstPartyDomain. r=arthuredelstein,baku Differential Revision: https://phabricator.services.mozilla.com/D1978 --HG-- extra : moz-landing-system : lando --- .../test/browser/browser_firstPartyIsolation.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/browser/components/originattributes/test/browser/browser_firstPartyIsolation.js b/browser/components/originattributes/test/browser/browser_firstPartyIsolation.js index 560de8c8f572..06bc21255a94 100644 --- a/browser/components/originattributes/test/browser/browser_firstPartyIsolation.js +++ b/browser/components/originattributes/test/browser/browser_firstPartyIsolation.js @@ -278,3 +278,22 @@ add_task(async function window_open_form_test() { gBrowser.removeTab(tab); await BrowserTestUtils.closeWindow(win); }); + +/** + * A test for using an IP address as the first party domain. + */ +add_task(async function ip_address_test() { + const ipAddr = "127.0.0.1"; + const ipHost = `http://${ipAddr}/browser/browser/components/originattributes/test/browser/`; + + let tab = BrowserTestUtils.addTab(gBrowser, ipHost + "test_firstParty.html"); + await BrowserTestUtils.browserLoaded(tab.linkedBrowser, true); + + await ContentTask.spawn(tab.linkedBrowser, { firstPartyDomain: ipAddr }, async function(attrs) { + info("document principal: " + content.document.nodePrincipal.origin); + Assert.equal(content.document.nodePrincipal.originAttributes.firstPartyDomain, + attrs.firstPartyDomain, "The firstPartyDomain should be set properly for the IP address"); + }); + + gBrowser.removeTab(tab); +});

1 0

[torbutton/master] Bug 26655: Adjust color and size of onion button
by gk＠torproject.org 13 Aug '18

13 Aug '18

commit e9b4af29d8acf595bd0da4253336db0783ad5b24 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 13 13:18:25 2018 +0000 Bug 26655: Adjust color and size of onion button Icon design by Antonela Debiasi. --- src/chrome/skin/torbutton-update-needed.svg | 16 +++++++++------- src/chrome/skin/torbutton.svg | 10 +++++----- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/chrome/skin/torbutton-update-needed.svg b/src/chrome/skin/torbutton-update-needed.svg index 73f819ec..12bcca31 100644 --- a/src/chrome/skin/torbutton-update-needed.svg +++ b/src/chrome/skin/torbutton-update-needed.svg @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> - <g id="Icon---Tor---Update" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> - <g id="Tor-Button-Icon" transform="translate(2.000000, 1.000000)" fill="#0C0C0D"> - <path d="M8.27206791,6.27905236 C7.88283063,6.53485117 6.37928571,7.48491742 6.38222311,7.48303971 C5.92467564,7.77552366 5.55774616,8.01739321 5.22956304,8.24495813 C4.62774003,8.66226724 4.1902024,9.01032507 3.90524298,9.30237927 C2.34845165,10.8521114 1.86583368,12.1863028 2.03292037,14.2840468 C2.17744778,16.6290092 3.98280543,18.7226974 6.62789966,19.5725823 C7.66430091,19.8978216 8.64783036,20 10.3045058,20 C12.4566798,20 14.4305353,19.426444 15.7257727,18.390024 C17.1602235,17.2499732 18,15.5258216 18,13.7581121 C18,11.9676824 17.2065463,10.2463814 15.7919239,9.00433992 C15.0624549,8.37501782 14.1112169,7.77509114 12.728283,7.03810567 C11.4758566,6.39901667 10.3718516,5.26209475 9.95586156,3.83344263 C9.74417905,4.87665258 9.16812751,5.7299448 8.27206791,6.27905236 Z M17.1048177,7.49557522 C18.9563878,9.1179941 20,11.3893805 20,13.7581121 C20,16.1268437 18.889058,18.4306785 16.9701581,19.9557522 C15.1859178,21.3834808 12.6947145,22 10.3045058,22 C8.8232498,22 7.47 665339,21.9351032 6.02906225,21.480826 C2.69623613,20.4100295 0.238697687,17.6843658 0.0367082257,14.4070796 C-0.165281236,11.8761062 0.440687149,9.92920354 2.49424667,7.88495575 C3.53785889,6.81415929 5.69241315,5.58112094 7.1736692,4.60766962 C7.91429722,4.15339233 8.68859016,2.79056047 7.20733411,0.227138643 L7.5103183,0 L11.9204215,1.75221239 C11.3144532,3.63421829 13.0650285,4.96460177 13.637332,5.25663717 C14.9165986,5.9380531 16.1285353,6.6519174 17.1048177,7.49557522 Z" id="Border" fill-rule="nonzero"></path> - <path d="M10,5.80000019 C10.3632315,6.90320629 11.2333653,7.78038283 12.2159038,8.28105702 C13.3397544,8.87914153 14.1127842,9.36599897 14.7055922,9.87671162 C15.8551945,10.8846633 16.5,12.2815477 16.5,13.7345319 C16.5,15.1690781 15.81755,16.5682758 14.6518339,17.4934592 C13.5992506,18.3345433 11.9951837,18.8000002 10.2462051,18.8000002 C10.1620472,18.8000002 10.0800269,18.7996762 10,18.7990042 L10,5.80000019 Z" id="Half-Content"></path> +<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <g id="Icon---Tor-Update---Grey" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="Tor-Button-Icon" fill="#0C0C0D" fill-opacity="0.8"> + <path d="M7.06561268,5.02241519 C6.77772045,5.2116121 5.67952408,5.90554501 5.6853992,5.90178938 C5.35790364,6.11113858 5.09635335,6.28354515 4.86413018,6.44457064 C4.45268439,6.72987059 4.15887546,6.96359333 3.97499388,7.15193679 C2.95731966,8.16499644 2.66333288,8.97771922 2.77290903,10.3548433 C2.86347409,11.8242645 4.01769529,13.1628244 5.73360996,13.7141752 C6.42393225,13.9308094 7.08993386,14 8.24418607,14 C9.69409954,14 11.010192,13.6175745 11.8475477,12.9475461 C12.7611494,12.2214478 13.2954545,11.1244618 13.2954545,10.0058997 C13.2954545,8.86286776 12.7876949,7.76058164 11.8769727,6.9600938 C11.3838667,6.53505399 10.722397,6.11798563 9.75901067,5.60447735 C9.08955454,5.26286683 8.4719792,4.75203246 8.02479915,4.11379651 C7.77978416,4.4739196 7.45874047,4.78154253 7.06561268,5.02241519 Z M13.1898674,5.45132743 C14.5364638,6.63126844 15.2954545,8.28318584 15.2954545,10.0058997 C15.2954545,11.7286136 14.4874967,13.4041298 13.0919331,14.5132743 C11.7943039,15.551622 4 9.98251962,16 8.24418607,16 C7.16690894,16 6.1875661,15.9528024 5.13477254,15.6224189 C2.71089901,14.8436578 0.923598318,12.8613569 0.776696891,10.4778761 C0.629795465,8.63716814 1.07049974,7.22123894 2.56399758,5.73451327 C3.32298828,4.95575221 4.88993683,4.05899705 5.96721396,3.35103245 C6.50585253,3.02064897 7.06897466,2.02949853 5.99169753,0.16519174 L6.21204967,0 L9.41939748,1.27433628 C8.97869321,2.64306785 10.2518389,3.61061947 10.6680596,3.82300885 C11.5984353,4.31858407 12.4798439,4.83775811 13.1898674,5.45132743 Z" id="Border" fill-rule="nonzero"></path> + <path d="M8.27272727,5 C8.49625435,5.67889606 9.03172133,6.21869701 9.63636041,6.5268042 C10.3279607,6.89485621 10.8036714,7.19446079 11.1684763,7.5087455 C11.8759239,8.12902347 12.2727273,8.98864463 12.2727273,9.88278877 C12.2727273,10.7655864 11.852758,11.6266312 11.1353943,12.1959748 C10.4876507,12.713565 9.5005326,13 8.42423809,13 C8.37244863,13 8.32197458,12.9998006 8.27272727,12.9993871 L8.27272727,5 Z" id="Half-Content"></path> + </g> + <g id="!" transform="translate(0.000000, 6.100000)"> + <polygon id="Triangle-Copy" fill="#414141" points="5 0.714285714 9.28571429 9.28571429 0.714285714 9.28571429"></polygon> + <path d="M9.78067261,7.86561722 C10.0020131,8.30856238 9.97819173,8.83453755 9.71771774,9.25566142 C9.45724375,9.6767853 8.9972698,9.93299087 8.50210118,9.93276007 L1.42710118,9.93276007 C0.932880889,9.93225088 0.474029854,9.67633171 0.213899592,9.2561101 C-0.0462306709,8.83588849 -0.0706843715,8.31106384 0.149244037,7.86847436 L3.68710118,0.789902932 C3.92904842,0.305811394 4.42377158,0 4.96495832,0 C5.50614506,0 6.00086822,0.305811394 6.24281547,0.789902932 L9.78067261,7.86561722 Z M4.25067261,2.78990293 L4.25067261,5.64704579 C4.25067261,6.0415349 4.57046922,6.3613315 4.96495832,6.3613315 C5.35944743,6.3613315 5.67924404,6.0415349 5.67924404,5.64704579 L5.67924404,2.78990293 C5.67924404,2.39541382 5.35944743,2.07561722 4.96495832,2.07561722 C4.57046922,2.07561722 4.25067261,2.39541382 4.25067261,2.78990293 Z M4.96495832,8.68276007 C5.45806971,8.68276007 5.85781547,8.28301432 5.85781547,7.78990293 C5.85781547,7.29679155 5.45806971,6.89704579 4.96495832,6.89704579 C4.47 184694,6.89704579 4.07210118,7.29679155 4.07210118,7.78990293 C4.07210118,8.28301432 4.47184694,8.68276007 4.96495832,8.68276007 Z" id="Shape-Copy" fill="#FFE900" fill-rule="nonzero"></path> </g> - <polygon id="Triangle" fill="#0C0C0D" points="7 11 13 23 1 23"></polygon> - <path d="M13.6929417,21.0118641 C14.0028183,21.6319873 13.9694684,22.3683526 13.6048048,22.957926 C13.2401412,23.5474994 12.5961777,23.9061872 11.9029417,23.9058641 L1.99794165,23.9058641 C1.30603325,23.9051512 0.663641796,23.5468644 0.299459428,22.9585541 C-0.0647229393,22.3702439 -0.0989581202,21.6354894 0.208941651,21.0158641 L5.16194165,11.1058641 C5.50066779,10.428136 6.19328022,10 6.95094165,10 C7.70860308,10 8.40121551,10.428136 8.73994165,11.1058641 L13.6929417,21.0118641 Z M5.95094165,13.9058641 L5.95094165,17.9058641 C5.95094165,18.4581489 6.3986569,18.9058641 6.95094165,18.9058641 C7.5032264,18.9058641 7.95094165,18.4581489 7.95094165,17.9058641 L7.95094165,13.9058641 C7.95094165,13.3535794 7.5032264,12.9058641 6.95094165,12.9058641 C6.3986569,12.9058641 5.95094165,13.3535794 5.95094165,13.9058641 Z M6.95094165,22.1558641 C7.64129759,22.1558641 8.20094165,21.59622 8.20094165,20.9058641 C8.20094165,20.2155082 7.64129759,19.6558641 6.95094165,19.6558641 C6.26058571, 19.6558641 5.70094165,20.2155082 5.70094165,20.9058641 C5.70094165,21.59622 6.26058571,22.1558641 6.95094165,22.1558641 Z" id="Shape" fill="#FFE900" fill-rule="nonzero"></path> </g> </svg> diff --git a/src/chrome/skin/torbutton.svg b/src/chrome/skin/torbutton.svg index 518e981d..11892c6f 100644 --- a/src/chrome/skin/torbutton.svg +++ b/src/chrome/skin/torbutton.svg @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> - <g id="Icon---Tor-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> - <g id="Tor-Button-Icon" transform="translate(2.000000, 1.000000)" fill="#0C0C0D"> - <path d="M8.27206791,6.27905236 C7.88283063,6.53485117 6.37928571,7.48491742 6.38222311,7.48303971 C5.92467564,7.77552366 5.55774616,8.01739321 5.22956304,8.24495813 C4.62774003,8.66226724 4.1902024,9.01032507 3.90524298,9.30237927 C2.34845165,10.8521114 1.86583368,12.1863028 2.03292037,14.2840468 C2.17744778,16.6290092 3.98280543,18.7226974 6.62789966,19.5725823 C7.66430091,19.8978216 8.64783036,20 10.3045058,20 C12.4566798,20 14.4305353,19.426444 15.7257727,18.390024 C17.1602235,17.2499732 18,15.5258216 18,13.7581121 C18,11.9676824 17.2065463,10.2463814 15.7919239,9.00433992 C15.0624549,8.37501782 14.1112169,7.77509114 12.728283,7.03810567 C11.4758566,6.39901667 10.3718516,5.26209475 9.95586156,3.83344263 C9.74417905,4.87665258 9.16812751,5.7299448 8.27206791,6.27905236 Z M17.1048177,7.49557522 C18.9563878,9.1179941 20,11.3893805 20,13.7581121 C20,16.1268437 18.889058,18.4306785 16.9701581,19.9557522 C15.1859178,21.3834808 12.6947145,22 10.3045058,22 C8.8232498,22 7.47 665339,21.9351032 6.02906225,21.480826 C2.69623613,20.4100295 0.238697687,17.6843658 0.0367082257,14.4070796 C-0.165281236,11.8761062 0.440687149,9.92920354 2.49424667,7.88495575 C3.53785889,6.81415929 5.69241315,5.58112094 7.1736692,4.60766962 C7.91429722,4.15339233 8.68859016,2.79056047 7.20733411,0.227138643 L7.5103183,0 L11.9204215,1.75221239 C11.3144532,3.63421829 13.0650285,4.96460177 13.637332,5.25663717 C14.9165986,5.9380531 16.1285353,6.6519174 17.1048177,7.49557522 Z" id="Border" fill-rule="nonzero"></path> - <path d="M10,5.80000019 C10.3632315,6.90320629 11.2333653,7.78038283 12.2159038,8.28105702 C13.3397544,8.87914153 14.1127842,9.36599897 14.7055922,9.87671162 C15.8551945,10.8846633 16.5,12.2815477 16.5,13.7345319 C16.5,15.1690781 15.81755,16.5682758 14.6518339,17.4934592 C13.5992506,18.3345433 11.9951837,18.8000002 10.2462051,18.8000002 C10.1620472,18.8000002 10.0800269,18.7996762 10,18.7990042 L10,5.80000019 Z" id="Half-Content"></path> +<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <g id="Icon---Tor---Grey" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" fill-opacity="0.8"> + <g id="Tor-Button-Icon" fill="#0C0C0D"> + <path d="M7.06561268,5.02241519 C6.77772045,5.2116121 5.67952408,5.90554501 5.6853992,5.90178938 C5.35790364,6.11113858 5.09635335,6.28354515 4.86413018,6.44457064 C4.45268439,6.72987059 4.15887546,6.96359333 3.97499388,7.15193679 C2.95731966,8.16499644 2.66333288,8.97771922 2.77290903,10.3548433 C2.86347409,11.8242645 4.01769529,13.1628244 5.73360996,13.7141752 C6.42393225,13.9308094 7.08993386,14 8.24418607,14 C9.69409954,14 11.010192,13.6175745 11.8475477,12.9475461 C12.7611494,12.2214478 13.2954545,11.1244618 13.2954545,10.0058997 C13.2954545,8.86286776 12.7876949,7.76058164 11.8769727,6.9600938 C11.3838667,6.53505399 10.722397,6.11798563 9.75901067,5.60447735 C9.08955454,5.26286683 8.4719792,4.75203246 8.02479915,4.11379651 C7.77978416,4.4739196 7.45874047,4.78154253 7.06561268,5.02241519 Z M13.1898674,5.45132743 C14.5364638,6.63126844 15.2954545,8.28318584 15.2954545,10.0058997 C15.2954545,11.7286136 14.4874967,13.4041298 13.0919331,14.5132743 C11.7943039,15.551622 4 9.98251962,16 8.24418607,16 C7.16690894,16 6.1875661,15.9528024 5.13477254,15.6224189 C2.71089901,14.8436578 0.923598318,12.8613569 0.776696891,10.4778761 C0.629795465,8.63716814 1.07049974,7.22123894 2.56399758,5.73451327 C3.32298828,4.95575221 4.88993683,4.05899705 5.96721396,3.35103245 C6.50585253,3.02064897 7.06897466,2.02949853 5.99169753,0.16519174 L6.21204967,0 L9.41939748,1.27433628 C8.97869321,2.64306785 10.2518389,3.61061947 10.6680596,3.82300885 C11.5984353,4.31858407 12.4798439,4.83775811 13.1898674,5.45132743 Z" id="Border" fill-rule="nonzero"></path> + <path d="M8.27272727,5 C8.49625435,5.67889606 9.03172133,6.21869701 9.63636041,6.5268042 C10.3279607,6.89485621 10.8036714,7.19446079 11.1684763,7.5087455 C11.8759239,8.12902347 12.2727273,8.98864463 12.2727273,9.88278877 C12.2727273,10.7655864 11.852758,11.6266312 11.1353943,12.1959748 C10.4876507,12.713565 9.5005326,13 8.42423809,13 C8.37244863,13 8.32197458,12.9998006 8.27272727,12.9993871 L8.27272727,5 Z" id="Half-Content"></path> </g> </g> </svg>

1 0

[tor-browser-build/master] Bug 27101: fix tor build issue with rust enabled
by gk＠torproject.org 13 Aug '18

13 Aug '18

commit 3ba2bd456ac69f81ffbf5f0baa403ad005aeff34 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 13 15:12:07 2018 +0200 Bug 27101: fix tor build issue with rust enabled Fix build issue introduced by the fix for #25485. --- projects/tor/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor/build b/projects/tor/build index 89a5418..c8f63bc 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -57,6 +57,8 @@ openssldir=/var/tmp/dist/openssl chmod 700 "$distdir"/Tor/libstdc++/*.so* # This is needed to make RPATH unavailable. See bug 9150. export LD_LIBRARY_PATH="$distdir/Tor/" + # Add libstdc++ to LD_LIBRARY_PATH to avoid rust link issue (bug 27101) + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$distdir/Tor/libstdc++/" [% END %] [% IF c("var/osx") %]

1 0

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

13 Aug '18

commit 975b6f238bf21fc0e567f7622871a3f55722913d Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Aug 1 09:44:12 2018 -0700 squash! TB4: Tor Browser's Firefox preference overrides. Bug 17252: Enable session identifiers with FPI Session tickets and session identifiers were isolated by OriginAttributes, so we can re-enable them by allowing the default value (true) of "security.ssl.disable_session_identifiers". The pref "security.enable_tls_session_tickets" is obsolete (removed in https://bugzilla.mozilla.org/917049) --- browser/app/profile/000-tor-browser.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 57d04f36bc3d..d0fdbe1040b4 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -174,7 +174,6 @@ pref("browser.cache.frecency_experiment", -1); // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation pref("network.cookie.cookieBehavior", 1); -pref("security.enable_tls_session_tickets", false); pref("network.http.spdy.enabled", false); // Stores state and may have keepalive issues (both fixable) pref("network.http.spdy.enabled.v2", false); // Seems redundant, but just in case pref("network.http.spdy.enabled.v3", false); // Seems redundant, but just in case @@ -270,7 +269,6 @@ 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("security.ssl.disable_session_identifiers", true); 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

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

13 Aug '18

commit 49b80d55c275d4a59484b8e955d9d4eeac2d8d44 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 1 07:59:54 2018 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes bug 26409. We rely on the fix for Mozilla's bug 1039069 for providing a spoofed Accept-Language header/JS locale if the user wants to. --- 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 1ab4dd39a13c..57d04f36bc3d 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -147,10 +147,6 @@ 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) pref("dom.gamepad.enabled", false); // bugs.torproject.org/13023 -pref("javascript.use_us_english_locale", true); -// pref("intl.accept_languages", "en-us, en"); // Set by Torbutton -// pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); // Set by Torbutton -// pref("intl.charsetmenu.browser.cache", "UTF-8"); // Set by Torbutton // Disable video statistics fingerprinting vector (bug 15757) pref("media.video_stats.enabled", false); // Set video VP9 to 0 for everyone (bug 22548)

1 0

[torbutton/master] Bug 26409: Remove spoofed locale implementation
by gk＠torproject.org 13 Aug '18

13 Aug '18

commit e950aeac23670983bedd84c6526bb9a865450a25 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 1 08:04:21 2018 +0000 Bug 26409: Remove spoofed locale implementation In bug 1039069 Mozilla implemented the option of spoofing the locale in the Accept-Language header/JS locale if users with localized builds want that for better fingerprinting protection. That makes our workaround in Torbutton obsolete and we can remove it. Otherwise users start to get the respective language prompt twice, which is quite annoying. --- src/chrome/content/torbutton.js | 109 +----------------------------- src/chrome/locale/en/torbutton.properties | 1 - src/defaults/preferences/preferences.js | 2 - 3 files changed, 1 insertion(+), 111 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 18895927..d0195b46 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -12,7 +12,7 @@ let { showDialog } = Cu.import("resource://torbutton/modules/utils.js", {}); let { getLocale, unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); let NoScriptControl = Cu.import("resource://torbutton/modules/noscript-control.js", {}); -let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {}); +let { bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js", {}); Cu.importGlobalProperties(["XMLHttpRequest"]); @@ -170,7 +170,6 @@ var torbutton_unique_pref_observer = torbutton_use_nontor_proxy(); break; case "privacy.resistFingerprinting": - case "extensions.torbutton.spoof_english": torbutton_update_fingerprinting_prefs(); break; case "privacy.firstparty.isolate": @@ -463,36 +462,6 @@ var torbutton_abouttor_message_handler = { } }; -function torbutton_should_prompt_for_language_preference() { - return torbutton_get_general_useragent_locale().substring(0, 2) != "en" && - !m_tb_prefs.getBoolPref("extensions.torbutton.prompted_language"); -} - - -// Bug 1506 P3: This code asks the user once if they want to spoof their -// language to English. -// -// Asks the user whether Torbutton should make "English requests", and updates -// the extensions.torbutton.spoof_english preference accordingly. -function torbutton_prompt_for_language_preference() { - var prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"] - .getService(Ci.nsIPromptService); - - // Display two buttons, both with string titles. - var flags = prompts.STD_YES_NO_BUTTONS; - - var message = torbutton_get_property_string("torbutton.popup.prompted_language"); - - m_tb_prefs.setBoolPref("extensions.torbutton.prompted_language", true); - // Display modal prompt, anchored to this window. - var response = prompts.confirmEx(window, "", message, flags, - null, null, null, null, {value: false}); - - // Update preferences to reflect their response and to prevent the prompt from - // being displayed again. - m_tb_prefs.setBoolPref("extensions.torbutton.spoof_english", response == 0); -} - function torbutton_confirm_plugins() { var any_plugins_enabled = false; var PH=Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost); @@ -1641,23 +1610,6 @@ function torbutton_update_disk_prefs() { function torbutton_update_fingerprinting_prefs() { var mode = m_tb_prefs.getBoolPref("privacy.resistFingerprinting"); - if (m_tb_tbb) { - if (mode) { - // Governed also by the spoof_english dialog.. - if (m_tb_prefs.getBoolPref("extensions.torbutton.spoof_english")) { - m_tb_prefs.setCharPref("intl.accept_languages", "en-US, en"); - m_tb_prefs.setBoolPref("javascript.use_us_english_locale", true); - } else { - if(m_tb_prefs.prefHasUserValue("intl.accept_languages")) - m_tb_prefs.clearUserPref("intl.accept_languages"); - m_tb_prefs.setBoolPref("javascript.use_us_english_locale", false); - } - } else { - if(m_tb_prefs.prefHasUserValue("intl.accept_languages")) - m_tb_prefs.clearUserPref("intl.accept_languages"); - } - } - m_tb_prefs.setBoolPref("webgl.min_capability_mode", mode); m_tb_prefs.setBoolPref("webgl.disable-extensions", mode); m_tb_prefs.setBoolPref("dom.network.enabled", !mode); @@ -2019,8 +1971,6 @@ function torbutton_is_windowed(wind) { return true; } -let stopLanguagePromptObserver; - // Bug 1506 P3: This is needed pretty much only for the version check // and the window resizing. See comments for individual functions for // details @@ -2054,15 +2004,6 @@ function torbutton_new_window(event) Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT); } - // If the default language is not English and we have not already asked, - // add an http-on-modify-request observer that will show a "request English - // language web pages?" prompt the first time a content http or https page - // is opened. - if (torbutton_should_prompt_for_language_preference()) { - stopLanguagePromptObserver = observe("http-on-modify-request", - torbutton_http_connection_observed); - } - // Check the version on every new window. We're already pinging check in these cases. torbutton_do_async_versioncheck(); @@ -2238,54 +2179,6 @@ var torbutton_resizelistener = onSecurityChange: function() {} }; -function torbutton_http_connection_observed(aRequest, aData) { - // If we are loading an HTTP page from content, show the - // "request English language web pages?" prompt. - try { - let httpChannel = aRequest.QueryInterface(Ci.nsIHttpChannel); - if (!aRequest.URI.schemeIs("http") && !aRequest.URI.schemeIs("https")) { - return; - } - if (!httpChannel) return; - let notificationCallbacks = httpChannel.notificationCallbacks; - if (!notificationCallbacks) return; - let loadContext = notificationCallbacks.getInterface(Ci.nsILoadContext); - if (!loadContext) return; - if (!loadContext.isContent) return; - // The above QI did not throw, the scheme is http[s], and we know the - // load context is content, so we must have a true HTTP request from content. - // Stop the observer and display the prompt if another window has - // not already done so. - stopLanguagePromptObserver(); - - if (torbutton_should_prompt_for_language_preference()) { - if (torbutton_is_homepage_url(aRequest.URI)) { - // If the homepage is being loaded, display the prompt after a - // delay to avoid a problem where a blank prompt is displayed. - // In this case, the homepage will be loaded using the current - // spoof English setting, which is OK. - setTimeout(function() { - if (torbutton_should_prompt_for_language_preference()) - torbutton_prompt_for_language_preference(); - }, 2000); - } else { - // No delay is needed. Display the prompt and fix up the - // Accept-Language header before allowing the load to continue. - torbutton_prompt_for_language_preference(); - - // The Accept-Language header for this request was set when the - // channel was created. Reset it to match the value that will be - // used for future requests. - let val = torbutton_get_current_accept_language_value(aRequest.URI); - if (val) - httpChannel.setRequestHeader("Accept-Language", val, false); - } - } - } catch (e) { - torbutton_log(3, e.message); - } -} - // aURI should be an http or https nsIURI object. function torbutton_get_current_accept_language_value(aURI) { diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index d77af1ee..53573df0 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -21,7 +21,6 @@ torbutton.popup.external.suggest = To be safe, you should only open downloaded f torbutton.popup.launch = Download file torbutton.popup.cancel = Cancel torbutton.popup.dontask = Automatically download files from now on -torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 5cfb0eb3..ab9b4bf4 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -19,7 +19,6 @@ pref("extensions.torbutton.use_nontor_proxy",false); // State prefs: pref("extensions.torbutton.startup",false); pref("extensions.torbutton.inserted_button",false); -pref("extensions.torbutton.prompted_language",false); // TODO: This is just part of a stopgap until #14429 gets properly implemented. // See #7255 for details. We display the warning three times to make sure the @@ -29,7 +28,6 @@ pref("extensions.torbutton.maximize_warnings_remaining", 3); // Security prefs: pref("extensions.torbutton.cookie_protections",true); pref("extensions.torbutton.cookie_auto_protect",false); -pref("extensions.torbutton.spoof_english",true); pref("extensions.torbutton.clear_http_auth",true); pref("extensions.torbutton.close_newnym",true); pref("extensions.torbutton.resize_new_windows",true);

1 0

[tor-browser-build/master] Fix typo in README.MAKEFILE
by boklm＠torproject.org 08 Aug '18

08 Aug '18

commit 3788a45e3dc53d310a52b4262d1ceb7615a12e50 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 8 12:17:43 2018 +0200 Fix typo in README.MAKEFILE --- README.MAKEFILE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.MAKEFILE b/README.MAKEFILE index 8094651..7fd05e9 100644 --- a/README.MAKEFILE +++ b/README.MAKEFILE @@ -47,7 +47,7 @@ testbuild --------- Build a Tor Browser test build. To make the build faster, only the en-US locale is created, without mar files. By default it is based on the -alpha channel, but you can change that by editing rbm.conf.local. +alpha channel, but you can change that by editing rbm.local.conf. The resulting build can be found in directory testbuild. {release,alpha,nightly,testbuild}-linux-x86_64-debug

1 0

[tor-browser-build/master] Bug 25485: Fix libstdc++.so.6 compatibility for Tor Browser
by boklm＠torproject.org 08 Aug '18

08 Aug '18

commit 6a89049c0d1200302a59f74e71151466ddae5582 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Aug 7 10:08:30 2018 -0400 Bug 25485: Fix libstdc++.so.6 compatibility for Tor Browser We ship our version of libstdc++.so.6 for backward compatibility of Tor Browser on older systems like Ubuntu 16.04. However, a newer version of the library may be installed on the user's system and we should detect and use that. This commit adds support for detecting the library using a C++ program that uses the latest ABI; if the program executes, we should use the system library, and if not (for the older systems), we add our libstdc++.so.6 to LD_LIBRARY_PATH. --- projects/firefox/abicheck.cc | 35 ++++++++++++++++++++++ projects/firefox/build | 4 +++ projects/firefox/config | 2 ++ .../tor-browser/RelativeLink/start-tor-browser | 7 +++++ projects/tor/build | 4 ++- 5 files changed, 51 insertions(+), 1 deletion(-) diff --git a/projects/firefox/abicheck.cc b/projects/firefox/abicheck.cc new file mode 100644 index 0000000..cbecafa --- /dev/null +++ b/projects/firefox/abicheck.cc @@ -0,0 +1,35 @@ +/* + * Bug 25485: Browser/TorBrowser/Tor/libstdc++.so.6: version `CXXABI_1.3.11' not found + * This program is borrowed from + * https://en.cppreference.com/w/cpp/error/uncaught_exception and is useful in + * determining the latest C++ ABI. Specifically this program requires + * `GLIBCXX_3.4.22` which we use to compare the version of the installed + * libstdc++.so.6 and the bundled version. If the program executes + * successfully, that means we should use the system version of libstdc++.so.6 + * and if not, that means we should use the bundled version. + */ + +#include <iostream> +#include <exception> +#include <stdexcept> + +struct Foo { + int count = std::uncaught_exceptions(); + ~Foo() { + std::cout << (count == std::uncaught_exceptions() + ? "~Foo() called normally\n" + : "~Foo() called during stack unwinding\n"); + } +}; + +int main() +{ + Foo f; + try { + Foo f; + std::cout << "Exception thrown\n"; + throw std::runtime_error("test exception"); + } catch (const std::exception& e) { + std::cout << "Exception caught: " << e.what() << '\n'; + } +} diff --git a/projects/firefox/build b/projects/firefox/build index da1e71b..4dd0945 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -237,6 +237,10 @@ ELSE; END; %] +[% IF c("var/linux") %] + /var/tmp/dist/gcc/bin/g++ $rootdir/abicheck.cc -o Browser/abicheck +[% END %] + [% c('tar', { tar_src => [ browserdir ], tar_args => '-czf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser.tar.gz', diff --git a/projects/firefox/config b/projects/firefox/config index 3284ed4..02a380d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -116,3 +116,5 @@ input_files: - project: fxc2 name: fxc2 enable: '[% c("var/windows") %]' + - filename: abicheck.cc + enable: '[% c("var/linux") %]' diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser index 6639f44..47fbdef 100755 --- a/projects/tor-browser/RelativeLink/start-tor-browser +++ b/projects/tor-browser/RelativeLink/start-tor-browser @@ -274,7 +274,14 @@ if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then fi LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/" +# Check if the system has a more recent version of libstdc++.so.6; if yes, use +# that instead of the bundled version. +./abicheck >/dev/null 2>&1 +if [ $? -ne 0 ]; then + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${HOME}/TorBrowser/Tor/libstdc++/" +fi export LD_LIBRARY_PATH + [% IF ! c("var/release") %] export SELFRANDO_write_layout_file= [% END %] diff --git a/projects/tor/build b/projects/tor/build index 8f129d6..89a5418 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -47,12 +47,14 @@ openssldir=/var/tmp/dist/openssl # LD_LIBRARY_PATH value to the Tor Browser with the newer one. Thus, we copy # the libstdc++ into the directory with the libs tor depends on, too. See bug # 13359 for further details. - cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libstdc++.so.6 "$distdir/Tor/" + mkdir -p "$distdir/Tor/libstdc++" + cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libstdc++.so.6 "$distdir/Tor/libstdc++/" [% IF c("var/asan") -%] cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libasan.so.3 "$distdir/Tor/" cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libubsan.so.0 "$distdir/Tor/" [% END -%] chmod 700 "$distdir"/Tor/*.so* + chmod 700 "$distdir"/Tor/libstdc++/*.so* # This is needed to make RPATH unavailable. See bug 9150. export LD_LIBRARY_PATH="$distdir/Tor/" [% END %]

1 0

[tor-browser-build/master] Bug: 27020: RBM build fails with runc version 1.0.1
by boklm＠torproject.org 03 Aug '18

03 Aug '18

commit 3960ad5d91701ef9b22e57eef8532e7a2e19b9db Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Aug 1 11:29:46 2018 -0700 Bug: 27020: RBM build fails with runc version 1.0.1 runc version on Ubuntu 18.04 is 1.0.1 which is not currently handled in rbm.conf, so the runc_spec100 flag does not get set properly. This patch changes it so the runc_spec100 flag is set if a spec string greater than 1.0.0 is found. --- rbm.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rbm.conf b/rbm.conf index d046d86..8cfa5e2 100644 --- a/rbm.conf +++ b/rbm.conf @@ -390,11 +390,11 @@ ENV: my ($out) = capture_exec('sudo', 'runc', '--version'); return !($out =~ m/^runc version 0.1.1/); }, - # runc_spec100 is true if runc spec is exactly 1.0.0 + # runc_spec100 is true if runc spec is at least 1.0.0 # We will need to update this when there is a new spec version available runc_spec100 => sub { my ($out) = capture_exec('sudo', 'runc', '--version'); - return $out =~ m/^spec: 1\.0\.0$/m; + return $out =~ m/^.*spec: 1\.[0-9]+\.[0-9]+$/m; }, }, )

1 0

[tor-launcher/master] Bug 26985: Help button icons missing
by gk＠torproject.org 31 Jul '18

31 Jul '18

commit 2a2a1ac8da14983ff682c46e0d8426cb2590ec41 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 31 13:54:26 2018 -0400 Bug 26985: Help button icons missing The image we previously used has been removed from Firefox, so use ESR 60's new help button image instead. Background shading is used for the hover and active states. --- src/chrome/content/network-settings-overlay.xul | 6 ++++-- src/chrome/skin/network-settings.css | 26 +++++++------------------ 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index 3d42c15..35b9fc7 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -98,8 +98,10 @@ <radio id="bridgeRadioDefault" label="&torsettings.useBridges.default;" selected="true" oncommand="onBridgeTypeRadioChange()"/> - <button class="helpButton" - oncommand="onOpenHelp('bridgeHelpContent')"/> + <vbox pack="center"> + <button class="helpButton" + oncommand="onOpenHelp('bridgeHelpContent')"/> + </vbox> <spacer style="width: 3em"/> <menulist id="defaultBridgeType" sizetopopup="always" placeholder="&torsettings.useBridges.default.placeholder;"> diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 9a02493..c6a9f0b 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -133,8 +133,9 @@ wizard.os-mac #bridgeList { /* reuse Mozilla's help button from the Firefox hamburger menu */ .helpButton { - list-style-image: url(chrome://browser/skin/menuPanel-help.png); - -moz-image-region: rect(0, 16px, 16px, 0); + background: url('chrome://global/skin/icons/help.svg') no-repeat center center; + background-size: 16px 16px; + cursor: pointer; -moz-appearance: none; height: 16px; width: 16px; @@ -152,26 +153,13 @@ wizard.os-mac #bridgeList { } .helpButton:hover { - -moz-image-region: rect(0, 32px, 16px, 16px); + background-color: rgba(12, 12, 13, 0.1); + border-radius: 50%; } .helpButton:hover:active { - -moz-image-region: rect(0, 48px, 16px, 32px); -} - -@media (min-resolution: 8.1dppx) { - .helpButton { - list-style-image: url(chrome://browser/skin/menuPanel-help@2x.png); - -moz-image-region: rect(0, 32px, 32px, 0); - } - - .helpButton:hover { - -moz-image-region: rect(0, 64px, 32px, 32px); - } - - .helpButton:hover:active { - -moz-image-region: rect(0, 96px, 32px, 64px); - } + background-color: rgba(12, 12, 13, 0.15); + border-radius: 50%; } #progressContent[isShowingReconfigure] description,

1 0

[tor-launcher/master] Bug 25509: Improve the proxy help text.
by gk＠torproject.org 31 Jul '18

31 Jul '18

commit 392ba14d7d148edafa58eabb1ea18d95e917dd6d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 31 14:07:33 2018 -0400 Bug 25509: Improve the proxy help text. --- src/chrome/locale/en/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 4615146..c6c5687 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -52,7 +52,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor.">

1 0