richard pushed to branch tor-browser-115.9.0esr-13.5-1 at The Tor Project / Applications / Tor Browser

Commits: 2b1f695a by Pier Angelo Vendrame at 2024-04-09T19:50:54+00:00 fixup! Bug 40933: Add tor-launcher functionality

Bug 42510: Do not call SETCONF when we do not own the tor daemon.

- - - - - 3f77b1ff by Pier Angelo Vendrame at 2024-04-09T19:50:54+00:00 fixup! Bug 40597: Implement TorSettings module

Bug 42511: Fixed a typo

TorConnectState.DisabledState -> TorConnectState.Disabled

- - - - -

2 changed files:

- toolkit/components/tor-launcher/TorProvider.sys.mjs - toolkit/modules/TorConnect.sys.mjs

Changes:

===================================== toolkit/components/tor-launcher/TorProvider.sys.mjs ===================================== @@ -226,16 +226,18 @@ export class TorProvider { throw e; }

- try { - await lazy.TorSettings.initializedPromise; - await this.writeSettings(lazy.TorSettings.getSettings()); - } catch (e) { - logger.warn( - "Failed to initialize TorSettings or to write our settings, so uninitializing.", - e - ); - this.uninit(); - throw e; + if (this.ownsTorDaemon) { + try { + await lazy.TorSettings.initializedPromise; + await this.writeSettings(lazy.TorSettings.getSettings()); + } catch (e) { + logger.warn( + "Failed to initialize TorSettings or to write our settings, so uninitializing.", + e + ); + this.uninit(); + throw e; + } }

TorLauncherUtil.setProxyConfiguration(this.#socksSettings);

===================================== toolkit/modules/TorConnect.sys.mjs ===================================== @@ -723,7 +723,7 @@ class DisabledState extends StateCallback { allowedTransitions = Object.freeze([]);

constructor() { - super(TorConnectState.DisabledState); + super(TorConnectState.Disabled); }

async run() {

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5dc406d...