[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-115.9.0esr-13.5-1] 2 commits: fixup! Bug 40933: Add tor-launcher functionality

Title: GitLab

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:

Changes:

  • toolkit/components/tor-launcher/TorProvider.sys.mjs
    ... ... @@ -226,16 +226,18 @@ export class TorProvider {
    226 226 
           throw e;
    227 227 
         }
    228 228
    229 
    -    try {
    230 
    -      await lazy.TorSettings.initializedPromise;
    231 
    -      await this.writeSettings(lazy.TorSettings.getSettings());
    232 
    -    } catch (e) {
    233 
    -      logger.warn(
    234 
    -        "Failed to initialize TorSettings or to write our settings, so uninitializing.",
    235 
    -        e
    236 
    -      );
    237 
    -      this.uninit();
    238 
    -      throw e;
    229 
    +    if (this.ownsTorDaemon) {
    230 
    +      try {
    231 
    +        await lazy.TorSettings.initializedPromise;
    232 
    +        await this.writeSettings(lazy.TorSettings.getSettings());
    233 
    +      } catch (e) {
    234 
    +        logger.warn(
    235 
    +          "Failed to initialize TorSettings or to write our settings, so uninitializing.",
    236 
    +          e
    237 
    +        );
    238 
    +        this.uninit();
    239 
    +        throw e;
    240 
    +      }
    239 241 
         }
    240 242
    241 243 
         TorLauncherUtil.setProxyConfiguration(this.#socksSettings);

  • toolkit/modules/TorConnect.sys.mjs
    ... ... @@ -723,7 +723,7 @@ class DisabledState extends StateCallback {
    723 723 
       allowedTransitions = Object.freeze([]);
    724 724
    725 725 
       constructor() {
    726 
    -    super(TorConnectState.DisabledState);
    726 
    +    super(TorConnectState.Disabled);
    727 727 
       }
    728 728
    729 729 
       async run() {

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits