October 2020 - tor-commits - lists.torproject.org

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 07 Oct '20

07 Oct '20

commit a9f1af16eba7a14d9a66b97d2047a80534ff6e6c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 07:15:06 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- sw/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sw/LC_MESSAGES/bridgedb.po b/sw/LC_MESSAGES/bridgedb.po index 5a0439cc8a..4ce74ac9c7 100644 --- a/sw/LC_MESSAGES/bridgedb.po +++ b/sw/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-10-07 06:34+0000\n" +"PO-Revision-Date: 2020-10-07 06:53+0000\n" "Last-Translator: Zaituni Njovu <zaituni(a)zainafoundationtz.org>\n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" @@ -187,13 +187,13 @@ msgstr "Hapa ndio madaraja yako:" msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "Umetumia zaidi ya kikomo chako. Tafadhali punguza! Muda unaohitajika kati ya barua pepe ni 1%s kwa saa. Hatuta pokea barua pepe, baada ya muda huu." +msgstr "Umezidisha kiwango kilichowekwa. Tafadhari punguza mwendo! kiwango cha kati cha muda kati ya\nbaruapepe ni %smasaa. baruapepe zote zitakazoingia katika kipindi cha wakati huu zitapuuzwa" #: bridgedb/strings.py:40 msgid "" "If these bridges are not what you need, reply to this email with one of\n" "the following commands in the message body:" -msgstr "" +msgstr "Kama haya madaraja siyo unayoyahitaji, jibu kupitia baruapepe hii na moja ya\namri zifuatazo katika kiini cha ujumbe:" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 07 Oct '20

07 Oct '20

commit 9763503070a5259f8161868468f654aa6031b4e4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 06:47:55 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- sw/network-settings.dtd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sw/network-settings.dtd b/sw/network-settings.dtd index 09f37933d5..552f408577 100644 --- a/sw/network-settings.dtd +++ b/sw/network-settings.dtd @@ -1,10 +1,10 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.dialog.title "Mipangilio ya mtandao wa Tor"> +<!ENTITY torsettings.wizard.title.default "Unganisha kwenye Tor"> +<!ENTITY torsettings.wizard.title.configure "Mipangilio ya mtandao wa Tor"> +<!ENTITY torsettings.wizard.title.connecting "Kuanzisha Muunganisho">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> +<!ENTITY torlauncher.localePicker.title "Lugha za Kivinjari cha Tor"> <!ENTITY torlauncher.localePicker.prompt "Please select a language.">  @@ -34,8 +34,8 @@ <!ENTITY torsettings.useProxy.username "Jina la mtumiaji"> <!ENTITY torsettings.useProxy.password "Nywila nenosiri"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> +<!ENTITY torsettings.useProxy.type.socks4 "SOKSI 4"> +<!ENTITY torsettings.useProxy.type.socks5 "SOKSI 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 07 Oct '20

07 Oct '20

commit ad0195c60a47d264eacbb41d468460a18590adf1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 06:46:48 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- sw.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sw.po b/sw.po index 4d33542b1a..633a075645 100644 --- a/sw.po +++ b/sw.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-10-06 07:46+0200\n" -"PO-Revision-Date: 2020-10-06 12:13+0000\n" -"Last-Translator: Louis Lloyd <louislloyd12(a)gmail.com>\n" +"PO-Revision-Date: 2020-10-07 06:38+0000\n" +"Last-Translator: Zaituni Njovu <zaituni(a)zainafoundationtz.org>\n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 07 Oct '20

07 Oct '20

commit b6f8334afe063df6ca80790fdaecd598749d6490 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 06:46:08 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- sw.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sw.po b/sw.po index 4032161876..45217a0515 100644 --- a/sw.po +++ b/sw.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-10-06 07:46+0200\n" -"PO-Revision-Date: 2020-10-06 12:13+0000\n" -"Last-Translator: Louis Lloyd <louislloyd12(a)gmail.com>\n" +"PO-Revision-Date: 2020-10-07 06:38+0000\n" +"Last-Translator: Zaituni Njovu <zaituni(a)zainafoundationtz.org>\n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -406,7 +406,7 @@ msgstr "" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:342 msgid "Enabled" -msgstr "" +msgstr "Kuwezesha" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:344 msgid "Disabled (default)" @@ -488,19 +488,19 @@ msgstr "" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/creator.py:138 msgid "Extracting live image to the target device..." -msgstr "" +msgstr "kuchukua picha halisi kwenda kwenye kifaa kilichokusudiwa" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/creator.py:145 #, python-format msgid "Wrote to device at %(speed)d MB/sec" -msgstr "" +msgstr "andika kwenye kifaa cha kielektroniki kwa %(speed)dMB kwa sekunde" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/creator.py:276 #, python-format msgid "" "There was a problem executing the following command: `%(command)s`.\n" "A more detailed error log has been written to '%(filename)s'." -msgstr "" +msgstr "kulikuwa na tatizo katika kufikia amri ifuatayo:%(command)s. maelezo zaidi kuhusu kosa hilo yameandika hapa '%(filename)s'." #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/creator.py:292 #, python-format

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 07 Oct '20

07 Oct '20

commit bd0c7aea12c2a9df283b570d70968565a283ab01 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 06:45:06 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- sw/LC_MESSAGES/bridgedb.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sw/LC_MESSAGES/bridgedb.po b/sw/LC_MESSAGES/bridgedb.po index dca2a7f7e3..5a0439cc8a 100644 --- a/sw/LC_MESSAGES/bridgedb.po +++ b/sw/LC_MESSAGES/bridgedb.po @@ -3,13 +3,13 @@ # This file is distributed under the same license as the bridgedb project. # # Translators: -# Zaituni Njovu <zaituni(a)zainafoundationtz.org>, 2019 +# Zaituni Njovu <zaituni(a)zainafoundationtz.org>, 2019-2020 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-06-22 08:48+0000\n" +"PO-Revision-Date: 2020-10-07 06:34+0000\n" "Last-Translator: Zaituni Njovu <zaituni(a)zainafoundationtz.org>\n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" @@ -91,7 +91,7 @@ msgstr "Msimbo huu wa QR unanayo mistari ya daraja lako. Scan msimbo wa QR msom #: bridgedb/distributors/https/templates/bridges.html:110 msgid "BridgeDB encountered an error." -msgstr "" +msgstr "DarajaDB imekumbwa na tatizo" #: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..." @@ -118,7 +118,7 @@ msgstr "Pakua 1%s Kivinjari cha Tor 1%s" #: bridgedb/distributors/https/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "" +msgstr "Hatua%s2%s" #: bridgedb/distributors/https/templates/index.html:28 #: bridgedb/distributors/https/templates/index.html:30 @@ -176,7 +176,7 @@ msgstr "1%s G 1%s et Madaraja" #: bridgedb/strings.py:33 msgid "[This is an automated email.]" -msgstr "" +msgstr "[Hii ni automatiki barua pepe]" #: bridgedb/strings.py:35 msgid "Here are your bridges:" @@ -187,7 +187,7 @@ msgstr "Hapa ndio madaraja yako:" msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "" +msgstr "Umetumia zaidi ya kikomo chako. Tafadhali punguza! Muda unaohitajika kati ya barua pepe ni 1%s kwa saa. Hatuta pokea barua pepe, baada ya muda huu." #: bridgedb/strings.py:40 msgid ""

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 07 Oct '20

07 Oct '20

commit 7dffb94ce9c6e4fb694ad1ed220c71873e5a41a3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 06:17:05 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+sw.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+sw.po b/contents+sw.po index dccc173b53..a0f8914252 100644 --- a/contents+sw.po +++ b/contents+sw.po @@ -830,7 +830,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.title) msgid "BRIDGES" -msgstr "" +msgstr "Madaraja" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.description)

1 0

[tor-browser/tor-browser-81.0.1-10.0-1] Bug 32092: Fix Tor Browser Support link in preferences
by sysrqb＠torproject.org 07 Oct '20

07 Oct '20

commit 5cca488d2e4ed1021464363a380b807aa62980b6 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Oct 15 22:54:10 2019 +0200 Bug 32092: Fix Tor Browser Support link in preferences --- browser/components/preferences/preferences.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js index fcb722eea0b2..9e97ca2a2180 100644 --- a/browser/components/preferences/preferences.js +++ b/browser/components/preferences/preferences.js @@ -166,10 +166,7 @@ function init_all() { gotoPref().then(() => { let helpButton = document.getElementById("helpButton"); - let helpUrl = - Services.urlFormatter.formatURLPref("app.support.baseURL") + - "preferences"; - helpButton.setAttribute("href", helpUrl); + helpButton.setAttribute("href", "https://support.torproject.org/tbb"); document.getElementById("addonsButton").addEventListener("click", e => { if (e.button >= 2) {

1 0

[tor-browser/tor-browser-81.0.1-10.0-1] Bug 27604: Fix addon issues when moving TB directory
by sysrqb＠torproject.org 07 Oct '20

07 Oct '20

commit 3d7f75d7c006e5e4585fc2a1eca67b78e683b68d Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Oct 30 10:44:48 2019 +0100 Bug 27604: Fix addon issues when moving TB directory --- toolkit/mozapps/extensions/internal/XPIProvider.jsm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index a27888278f77..78c0b0f7c702 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -485,7 +485,7 @@ class XPIState { // Builds prior to be 1512436 did not include the rootURI property. // If we're updating from such a build, add that property now. - if (!("rootURI" in this) && this.file) { + if (this.file) { this.rootURI = getURIForResourceInFile(this.file, "").spec; } @@ -498,7 +498,10 @@ class XPIState { saved.currentModifiedTime != this.lastModifiedTime ) { this.lastModifiedTime = saved.currentModifiedTime; - } else if (saved.currentModifiedTime === null) { + } else if ( + saved.currentModifiedTime === null && + (!this.file || !this.file.exists()) + ) { this.missing = true; } } @@ -1439,6 +1442,7 @@ var XPIStates = { if (oldState[loc.name]) { loc.restore(oldState[loc.name]); + changed = changed || loc.path != oldState[loc.name].path; } changed = changed || loc.changed;

1 0

[tor-browser/tor-browser-81.0.1-10.0-1] Bug 31607: App menu items stop working on macOS
by sysrqb＠torproject.org 07 Oct '20

07 Oct '20

commit 34092628552a941e22ac5fb2715faf90da3ab1a0 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Oct 3 10:53:43 2019 -0400 Bug 31607: App menu items stop working on macOS Avoid re-creating the hidden window, since this causes the nsMenuBarX object that is associated with the app menu to be freed (which in turn causes all of the app menu items to stop working). More detail: There should only be one hidden window. XREMain::XRE_mainRun() contains an explicit call to create the hidden window and that is the normal path by which it is created. However, when Tor Launcher's wizard/progress window is opened during startup, a hidden window is created earlier as a side effect of calls to nsAppShellService::GetHiddenWindow(). Then, when XREMain::XRE_mainRun() creates its hidden window, the original one is freed which also causes the app menu's nsMenuBarX object which is associated with that window to be destroyed. When that happens, the menuGroupOwner property within each Cocoa menu items's MenuItemInfo object is cleared. This breaks the link that is necessary for NativeMenuItemTarget's menuItemHit method to dispatch a menu item event. --- xpfe/appshell/nsAppShellService.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xpfe/appshell/nsAppShellService.cpp b/xpfe/appshell/nsAppShellService.cpp index d70fe4e6b239..9c6a09c10a0f 100644 --- a/xpfe/appshell/nsAppShellService.cpp +++ b/xpfe/appshell/nsAppShellService.cpp @@ -93,6 +93,10 @@ void nsAppShellService::EnsureHiddenWindow() { NS_IMETHODIMP nsAppShellService::CreateHiddenWindow() { + if (mHiddenWindow) { + return NS_OK; + } + if (!XRE_IsParentProcess()) { return NS_ERROR_NOT_IMPLEMENTED; }

1 0

[tor-browser/tor-browser-81.0.1-10.0-1] Bug 31740: Remove some unnecessary RemoteSettings instances
by sysrqb＠torproject.org 07 Oct '20

07 Oct '20

commit ee5920f60931cc593fcf972c8f34acb0f68ecdc5 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Oct 16 23:01:12 2019 +0200 Bug 31740: Remove some unnecessary RemoteSettings instances More concretely, SearchService.jsm 'hijack-blocklists' and url-classifier-skip-urls. Avoid creating instance for 'anti-tracking-url-decoration'. If prefs are disabling their usage, avoid creating instances for 'cert-revocations' and 'intermediates'. Do not ship JSON dumps for collections we do not expect to need. For the ones in the 'main' bucket, this prevents them from being synced unnecessarily (the code in remote-settings does so for collections in the main bucket for which a dump or local data exists). For the collections in the other buckets, we just save some size by not shipping their dumps. We also clear the collections database on the v2 -> v3 migration. --- .../url-classifier/UrlClassifierFeatureBase.cpp | 2 +- netwerk/url-classifier/components.conf | 6 ------ security/manager/ssl/RemoteSecuritySettings.jsm | 22 ++++++++++++++++++++++ services/settings/IDBHelpers.jsm | 4 ++++ services/settings/dumps/blocklists/moz.build | 1 - services/settings/dumps/main/moz.build | 6 ------ services/settings/dumps/security-state/moz.build | 1 - .../components/antitracking/antitracking.manifest | 2 +- toolkit/components/antitracking/components.conf | 7 ------- toolkit/components/search/SearchService.jsm | 2 -- 10 files changed, 28 insertions(+), 25 deletions(-) diff --git a/netwerk/url-classifier/UrlClassifierFeatureBase.cpp b/netwerk/url-classifier/UrlClassifierFeatureBase.cpp index 07da1fd07374..48bcc7d10af9 100644 --- a/netwerk/url-classifier/UrlClassifierFeatureBase.cpp +++ b/netwerk/url-classifier/UrlClassifierFeatureBase.cpp @@ -78,7 +78,7 @@ void UrlClassifierFeatureBase::InitializePreferences() { nsCOMPtr<nsIUrlClassifierExceptionListService> exceptionListService = do_GetService("@mozilla.org/url-classifier/exception-list-service;1"); - if (NS_WARN_IF(!exceptionListService)) { + if (!exceptionListService) { return; } diff --git a/netwerk/url-classifier/components.conf b/netwerk/url-classifier/components.conf index 03a02f0ebeab..b2e667247317 100644 --- a/netwerk/url-classifier/components.conf +++ b/netwerk/url-classifier/components.conf @@ -13,10 +13,4 @@ Classes = [ 'constructor': 'mozilla::net::ChannelClassifierService::GetSingleton', 'headers': ['mozilla/net/ChannelClassifierService.h'], }, - { - 'cid': '{b9f4fd03-9d87-4bfd-9958-85a821750ddc}', - 'contract_ids': ['@mozilla.org/url-classifier/exception-list-service;1'], - 'jsm': 'resource://gre/modules/UrlClassifierExceptionListService.jsm', - 'constructor': 'UrlClassifierExceptionListService', - }, ] diff --git a/security/manager/ssl/RemoteSecuritySettings.jsm b/security/manager/ssl/RemoteSecuritySettings.jsm index 3fedd43ed9be..fd2b69bc6a4f 100644 --- a/security/manager/ssl/RemoteSecuritySettings.jsm +++ b/security/manager/ssl/RemoteSecuritySettings.jsm @@ -350,6 +350,16 @@ var RemoteSecuritySettings = { class IntermediatePreloads { constructor() { + this.maybeInit(); + } + + maybeInit() { + if ( + this.client || + !Services.prefs.getBoolPref(INTERMEDIATES_ENABLED_PREF, true) + ) { + return; + } this.client = RemoteSettings( Services.prefs.getCharPref(INTERMEDIATES_COLLECTION_PREF), { @@ -379,6 +389,7 @@ class IntermediatePreloads { ); return; } + this.maybeInit(); // Download attachments that are awaiting download, up to a max. const maxDownloadsPerRun = Services.prefs.getIntPref( @@ -709,6 +720,16 @@ function compareFilters(filterA, filterB) { class CRLiteFilters { constructor() { + this.maybeInit(); + } + + maybeInit() { + if ( + this.client || + !Services.prefs.getBoolPref(CRLITE_FILTERS_ENABLED_PREF, true) + ) { + return; + } this.client = RemoteSettings( Services.prefs.getCharPref(CRLITE_FILTERS_COLLECTION_PREF), { @@ -734,6 +755,7 @@ class CRLiteFilters { ); return; } + this.maybeInit(); let current = await this.client.db.list(); let fullFilters = current.filter(filter => !filter.incremental); if (fullFilters.length < 1) { diff --git a/services/settings/IDBHelpers.jsm b/services/settings/IDBHelpers.jsm index 5dc59c3687ef..010a5ea82987 100644 --- a/services/settings/IDBHelpers.jsm +++ b/services/settings/IDBHelpers.jsm @@ -188,6 +188,10 @@ async function openIDB(allowUpgrades = true) { }); } if (event.oldVersion < 3) { + // Clear existing stores for a fresh start + transaction.objectStore("records").clear(); + transaction.objectStore("timestamps").clear(); + transaction.objectStore("collections").clear(); // Attachment store db.createObjectStore("attachments", { keyPath: ["cid", "attachmentId"], diff --git a/services/settings/dumps/blocklists/moz.build b/services/settings/dumps/blocklists/moz.build index 1683ab6aafa4..dd0bad30f19a 100644 --- a/services/settings/dumps/blocklists/moz.build +++ b/services/settings/dumps/blocklists/moz.build @@ -9,7 +9,6 @@ with Files('**'): # The addons blocklist is also in mobile/android/installer/package-manifest.in FINAL_TARGET_FILES.defaults.settings.blocklists += ['addons-bloomfilters.json', - 'addons.json', 'gfx.json', 'plugins.json'] diff --git a/services/settings/dumps/main/moz.build b/services/settings/dumps/main/moz.build index 8e202303e9c8..e25fc4214042 100644 --- a/services/settings/dumps/main/moz.build +++ b/services/settings/dumps/main/moz.build @@ -3,16 +3,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. FINAL_TARGET_FILES.defaults.settings.main += [ - 'anti-tracking-url-decoration.json', 'example.json', 'hijack-blocklists.json', 'language-dictionaries.json', - 'onboarding.json', - 'search-config.json', 'search-default-override-allowlist.json', - 'sites-classification.json', - 'top-sites.json', - 'url-classifier-skip-urls.json', ] if CONFIG['MOZ_BUILD_APP'] == 'browser': diff --git a/services/settings/dumps/security-state/moz.build b/services/settings/dumps/security-state/moz.build index d8f8227a0278..37410d0fb054 100644 --- a/services/settings/dumps/security-state/moz.build +++ b/services/settings/dumps/security-state/moz.build @@ -3,7 +3,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. FINAL_TARGET_FILES.defaults.settings['security-state'] += [ - 'intermediates.json', 'onecrl.json', ] diff --git a/toolkit/components/antitracking/antitracking.manifest b/toolkit/components/antitracking/antitracking.manifest index 5eb37f9a3f99..872e6af07575 100644 --- a/toolkit/components/antitracking/antitracking.manifest +++ b/toolkit/components/antitracking/antitracking.manifest @@ -1 +1 @@ -category profile-after-change URLDecorationAnnotationsService @mozilla.org/tracking-url-decoration-service;1 process=main +# category profile-after-change URLDecorationAnnotationsService @mozilla.org/tracking-url-decoration-service;1 process=main diff --git a/toolkit/components/antitracking/components.conf b/toolkit/components/antitracking/components.conf index 74a8a21277d9..04b2ba1b815f 100644 --- a/toolkit/components/antitracking/components.conf +++ b/toolkit/components/antitracking/components.conf @@ -11,13 +11,6 @@ Classes = [ 'jsm': 'resource://gre/modules/TrackingDBService.jsm', 'constructor': 'TrackingDBService', }, - { - 'cid': '{5874af6d-5719-4e1b-b155-ef4eae7fcb32}', - 'contract_ids': ['@mozilla.org/tracking-url-decoration-service;1'], - 'jsm': 'resource://gre/modules/URLDecorationAnnotationsService.jsm', - 'constructor': 'URLDecorationAnnotationsService', - 'processes': ProcessSelector.MAIN_PROCESS_ONLY, - }, { 'cid': '{90d1fd17-2018-4e16-b73c-a04a26fa6dd4}', 'contract_ids': ['@mozilla.org/purge-tracker-service;1'], diff --git a/toolkit/components/search/SearchService.jsm b/toolkit/components/search/SearchService.jsm index 86fd01c3b10a..a6d81ed66178 100644 --- a/toolkit/components/search/SearchService.jsm +++ b/toolkit/components/search/SearchService.jsm @@ -549,8 +549,6 @@ SearchService.prototype = { .catch(ex => logConsole.error("_init: failure determining region:", ex)) .finally(() => (this._ensureKnownRegionPromise = null)); - this._setupRemoteSettings().catch(Cu.reportError); - await this._loadEngines(cache); // If we've got this far, but the application is now shutting down,

1 0