fixup! TB 40597: Implement TorSettings module (be5cd3f9) · Commits · The Tor Project / Applications / Tor Browser

toolkit/components/tor-launcher/TorStartupService.sys.mjs

+2 −2

Original line number	Diff line number	Diff line
		@@ -3,14 +3,14 @@ const lazy = {};
		// We will use the modules only when the profile is loaded, so prefer lazy
		// loading
		ChromeUtils.defineESModuleGetters(lazy, {
		TorConnect: "resource://gre/modules/TorConnect.sys.mjs",
		TorConnect: "moz-src:///toolkit/modules/TorConnect.sys.mjs",
		TorDomainIsolator:
		"moz-src:///toolkit/components/tor-launcher/TorDomainIsolator.sys.mjs",
		TorLauncherUtil:
		"moz-src:///toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs",
		TorProviderBuilder:
		"moz-src:///toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs",
		TorSettings: "resource://gre/modules/TorSettings.sys.mjs",
		TorSettings: "moz-src:///toolkit/modules/TorSettings.sys.mjs",
		});

		/* Browser observer topis */

toolkit/modules/BridgeDB.sys.mjs

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		const lazy = {};

		ChromeUtils.defineESModuleGetters(lazy, {
		MoatRPC: "resource://gre/modules/Moat.sys.mjs",
		MoatRPC: "moz-src:///toolkit/modules/Moat.sys.mjs",
		});

		export var BridgeDB = {

toolkit/modules/DomainFrontedRequests.sys.mjs

+5 −3

Original line number	Diff line number	Diff line
		@@ -12,9 +12,11 @@ const log = console.createInstance({
		ChromeUtils.defineESModuleGetters(lazy, {
		EventDispatcher: "resource://gre/modules/Messaging.sys.mjs",
		Subprocess: "resource://gre/modules/Subprocess.sys.mjs",
		TorLauncherUtil: "resource://gre/modules/TorLauncherUtil.sys.mjs",
		TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs",
		TorSettings: "resource://gre/modules/TorSettings.sys.mjs",
		TorLauncherUtil:
		"moz-src:///toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs",
		TorProviderBuilder:
		"moz-src:///toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs",
		TorSettings: "moz-src:///toolkit/modules/TorSettings.sys.mjs",
		});

		/**

toolkit/modules/Moat.sys.mjs

+3 −3

Original line number	Diff line number	Diff line
		@@ -11,10 +11,10 @@ const log = console.createInstance({

		ChromeUtils.defineESModuleGetters(lazy, {
		DomainFrontRequestBuilder:
		"resource://gre/modules/DomainFrontedRequests.sys.mjs",
		"moz-src:///toolkit/modules/DomainFrontedRequests.sys.mjs",
		DomainFrontRequestCancelledError:
		"resource://gre/modules/DomainFrontedRequests.sys.mjs",
		TorBridgeSource: "resource://gre/modules/TorSettings.sys.mjs",
		"moz-src:///toolkit/modules/DomainFrontedRequests.sys.mjs",
		TorBridgeSource: "moz-src:///toolkit/modules/TorSettings.sys.mjs",
		});

		const TorLauncherPrefs = Object.freeze({

toolkit/modules/TorConnect.sys.mjs

+15 −9

Original line number	Diff line number	Diff line
		@@ -7,15 +7,21 @@ import { setTimeout, clearTimeout } from "resource://gre/modules/Timer.sys.mjs";
		const lazy = {};

		ChromeUtils.defineESModuleGetters(lazy, {
		MoatRPC: "resource://gre/modules/Moat.sys.mjs",
		TorBootstrapRequest: "resource://gre/modules/TorBootstrapRequest.sys.mjs",
		TorProviderState: "resource://gre/modules/TorProviderBuilder.sys.mjs",
		TorProviderTopics: "resource://gre/modules/TorProviderBuilder.sys.mjs",
		TorBootstrapError: "resource://gre/modules/TorProviderBuilder.sys.mjs",
		TorProviderInitError: "resource://gre/modules/TorProviderBuilder.sys.mjs",
		TorLauncherUtil: "resource://gre/modules/TorLauncherUtil.sys.mjs",
		TorSettings: "resource://gre/modules/TorSettings.sys.mjs",
		TorSettingsTopics: "resource://gre/modules/TorSettings.sys.mjs",
		MoatRPC: "moz-src:///toolkit/modules/Moat.sys.mjs",
		TorBootstrapRequest:
		"moz-src:///toolkit/components/tor-launcher/TorBootstrapRequest.sys.mjs",
		TorProviderState:
		"moz-src:///toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs",
		TorProviderTopics:
		"moz-src:///toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs",
		TorBootstrapError:
		"moz-src:///toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs",
		TorProviderInitError:
		"moz-src:///toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs",
		TorLauncherUtil:
		"moz-src:///toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs",
		TorSettings: "moz-src:///toolkit/modules/TorSettings.sys.mjs",
		TorSettingsTopics: "moz-src:///toolkit/modules/TorSettings.sys.mjs",
		});

		ChromeUtils.defineLazyGetter(lazy, "NetworkLinkService", () => {