morgan pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser

Commits:

14 changed files:

Changes:

  • browser/app/profile/000-tor-browser.js
    ... ... @@ -101,6 +101,7 @@ pref("extensions.torlauncher.tor_path", "");
    101 101
     // which is TorBrowser-Data/ if it exists as a sibling of the application
    
    102 102
     // directory. If TorBrowser-Data/ does not exist, these paths are relative
    
    103 103
     // to the TorBrowser/ directory within the application directory.
    
    104
    +pref
    
    104 105
     pref("extensions.torlauncher.torrc_path", "");
    
    105 106
     pref("extensions.torlauncher.tordatadir_path", "");
    
    106 107
     
    
    ... ... @@ -108,3 +109,17 @@ pref("extensions.torlauncher.tordatadir_path", "");
    108 109
     pref("extensions.torlauncher.bridgedb_front", "www.phpmyadmin.net");
    
    109 110
     pref("extensions.torlauncher.bridgedb_reflector", "https://1723079976.rsc.cdn77.org");
    
    110 111
     pref("extensions.torlauncher.moat_service", "https://bridges.torproject.org/moat");
    
    112
    +
    
    113
    +// Log levels
    
    114
    +pref("browser.tor_provider.log_level", "Warn");
    
    115
    +pref("browser.tor_provider.cp_log_level", "Warn");
    
    116
    +pref("lox.log_level", "Warn");
    
    117
    +pref("torbrowser.bootstrap.log_level", "Info");
    
    118
    +pref("browser.torsettings.log_level", "Warn");
    
    119
    +pref("browser.tordomainisolator.loglevel", "Warn");
    
    120
    +pref("browser.torcircuitpanel.loglevel", "Log");
    
    121
    +pref("browser.tor_android.log_level", "Info");
    
    122
    +pref("browser.dragdropfilter.log_level", "Warn");
    
    123
    +pref("browser.onionAuthPrompt.loglevel", "Warn");
    
    124
    +pref("browser.onionalias.log_level", "Warn");
    
    125
    +pref("browser.torRequestWatch.log_level", "Warn");

  • browser/app/profile/001-base-profile.js
    ... ... @@ -649,7 +649,8 @@ pref("privacy.query_stripping.strip_on_share.enabled", true);
    649 649
     // Disable platform text recogniition functionality (tor-browser#42057)
    
    650 650
     pref("dom.text-recognition.enabled", false);
    
    651 651
     
    
    652
    -pref("browser.onionAuthPrompt.loglevel", "Warn");
    
    652
    +// Log levels
    
    653
    +pref("browser.new_identity.log_level", "Info");
    
    653 654
     
    
    654 655
     #ifdef XP_WIN
    
    655 656
     pref("browser.taskbar.lists.enabled", false);
    

  • browser/components/newidentity/content/newidentity.js
    ... ... @@ -8,7 +8,6 @@ ChromeUtils.defineLazyGetter(this, "NewIdentityButton", () => {
    8 8
       // Logger adapted from CustomizableUI.jsm
    
    9 9
       const logger = (() => {
    
    10 10
         const consoleOptions = {
    
    11
    -      maxLogLevel: "Info",
    
    12 11
           maxLogLevelPref: "browser.new_identity.log_level",
    
    13 12
           prefix: "NewIdentity",
    
    14 13
         };
    

  • browser/components/onionservices/OnionAliasStore.sys.mjs
    ... ... @@ -29,11 +29,9 @@ const SECURE_DROP = {
    29 29
     };
    
    30 30
     
    
    31 31
     const kPrefOnionAliasEnabled = "browser.urlbar.onionRewrites.enabled";
    
    32
    -const kPrefOnionAliasLogLevel = "browser.onionalias.log_level";
    
    33 32
     
    
    34 33
     const log = console.createInstance({
    
    35
    -  maxLogLevel: "Warn",
    
    36
    -  maxLogLevelPref: kPrefOnionAliasLogLevel,
    
    34
    +  maxLogLevelPref: "browser.onionalias.log_level",
    
    37 35
       prefix: "OnionAlias",
    
    38 36
     });
    
    39 37
     
    

  • browser/components/onionservices/TorRequestWatch.sys.mjs
    ... ... @@ -3,7 +3,6 @@
    3 3
      * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
    
    4 4
     
    
    5 5
     const log = console.createInstance({
    
    6
    -  maxLogLevel: "Warn",
    
    7 6
       maxLogLevelPref: "browser.torRequestWatch.log_level",
    
    8 7
       prefix: "TorRequestWatch",
    
    9 8
     });
    

  • browser/components/torcircuit/content/torCircuitPanel.js
    ... ... @@ -56,7 +56,6 @@ var gTorCircuitPanel = {
    56 56
     
    
    57 57
         this._log = console.createInstance({
    
    58 58
           prefix: "TorCircuitPanel",
    
    59
    -      maxLogLevel: "Log",
    
    60 59
           maxLogLevelPref: "browser.torcircuitpanel.loglevel",
    
    61 60
         });
    
    62 61
     
    

  • toolkit/components/lox/Lox.sys.mjs
    ... ... @@ -9,7 +9,6 @@ const lazy = {};
    9 9
     
    
    10 10
     ChromeUtils.defineLazyGetter(lazy, "logger", () => {
    
    11 11
       return console.createInstance({
    
    12
    -    maxLogLevel: "Warn",
    
    13 12
         maxLogLevelPref: "lox.log_level",
    
    14 13
         prefix: "Lox",
    
    15 14
       });
    

  • toolkit/components/tor-launcher/TorControlPort.sys.mjs
    ... ... @@ -5,7 +5,6 @@
    5 5
     import { TorParsers } from "resource://gre/modules/TorParsers.sys.mjs";
    
    6 6
     
    
    7 7
     const logger = console.createInstance({
    
    8
    -  maxLogLevel: "Warn",
    
    9 8
       maxLogLevelPref: "browser.tor_provider.cp_log_level",
    
    10 9
       prefix: "TorControlPort",
    
    11 10
     });
    

  • toolkit/components/tor-launcher/TorDomainIsolator.sys.mjs
    ... ... @@ -25,7 +25,6 @@ XPCOMUtils.defineLazyServiceGetters(lazy, {
    25 25
     
    
    26 26
     const logger = console.createInstance({
    
    27 27
       prefix: "TorDomainIsolator",
    
    28
    -  maxLogLevel: "Warn",
    
    29 28
       maxLogLevelPref: "browser.tordomainisolator.loglevel",
    
    30 29
     });
    
    31 30
     
    

  • toolkit/components/tor-launcher/TorProvider.sys.mjs
    ... ... @@ -19,7 +19,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
    19 19
     });
    
    20 20
     
    
    21 21
     const logger = console.createInstance({
    
    22
    -  maxLogLevel: "Warn",
    
    23 22
       maxLogLevelPref: "browser.tor_provider.log_level",
    
    24 23
       prefix: "TorProvider",
    
    25 24
     });
    

  • toolkit/modules/DragDropFilter.sys.mjs
    ... ... @@ -14,8 +14,7 @@ ChromeUtils.defineLazyGetter(lazy, "logger", () => {
    14 14
       // fission.enforceBlocklistedPrefsInSubprocesses is true).
    
    15 15
       // (Or maybe this crash used to happen when the logger was not lazy, and maybe
    
    16 16
       // the preferences were not ready, yet?)
    
    17
    -  return new console.createInstance({
    
    18
    -    maxLogLevel: "Warn",
    
    17
    +  return console.createInstance({
    
    19 18
         maxLogLevelPref: "browser.dragdropfilter.log_level",
    
    20 19
         prefix: "DragDropFilter",
    
    21 20
       });
    

  • toolkit/modules/TorAndroidIntegration.sys.mjs
    ... ... @@ -19,7 +19,6 @@ const Prefs = Object.freeze({
    19 19
     });
    
    20 20
     
    
    21 21
     const logger = console.createInstance({
    
    22
    -  maxLogLevel: "Info",
    
    23 22
       maxLogLevelPref: Prefs.logLevel,
    
    24 23
       prefix: "TorAndroidIntegration",
    
    25 24
     });
    

  • toolkit/modules/TorConnect.sys.mjs
    ... ... @@ -74,7 +74,6 @@ export class TorConnectError extends Error {
    74 74
     
    
    75 75
     ChromeUtils.defineLazyGetter(lazy, "logger", () =>
    
    76 76
       console.createInstance({
    
    77
    -    maxLogLevel: "Info",
    
    78 77
         maxLogLevelPref: TorConnectPrefs.log_level,
    
    79 78
         prefix: "TorConnect",
    
    80 79
       })
    

  • toolkit/modules/TorSettings.sys.mjs
    ... ... @@ -14,7 +14,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
    14 14
     
    
    15 15
     ChromeUtils.defineLazyGetter(lazy, "logger", () => {
    
    16 16
       return console.createInstance({
    
    17
    -    maxLogLevel: "Warn",
    
    18 17
         maxLogLevelPref: "browser.torsettings.log_level",
    
    19 18
         prefix: "TorSettings",
    
    20 19
       });