[tor-commits] [tor-browser/tor-browser-91.2.0esr-11.0-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser

[sysrqb@xxxxxxxxxxxxxx]

commit bbbb7f4b0ca0fb9355a0840ecb5752fd3b4aa8fa
Author: Matthew Finkel <sysrqb@xxxxxxxxxxxxxx>
Date:   Fri Sep 3 03:52:26 2021 +0000

    fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
    
    This reverts commit 5d1c634d905f67c9fd53f5dd45133468f848b808.
---
 browser/modules/TorConnect.jsm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/browser/modules/TorConnect.jsm b/browser/modules/TorConnect.jsm
index 6444ab39e928..f2c92dcb8f21 100644
--- a/browser/modules/TorConnect.jsm
+++ b/browser/modules/TorConnect.jsm
@@ -241,7 +241,7 @@ const TorConnect = (() => {
             Services.obs.addObserver(this, BrowserTopics.ProfileAfterChange);
         },
 
-        observe: function(subject, topic, data) {
+        observe: async function(subject, topic, data) {
             console.log(`TorConnect: observed ${topic}`);
 
             switch(topic) {
@@ -306,7 +306,8 @@ const TorConnect = (() => {
             /* Handle bootstrap error*/
             case TorTopics.BootstrapError: {
                 const obj = subject?.wrappedJSObject;
-                TorProtocolService.torStopBootstrap().then(() => this.onError(obj.message, obj.details));
+                await TorProtocolService.torStopBootstrap();
+                this.onError(obj.message, obj.details);
                 break;
             }
             case TorTopics.LogHasWarnOrErr: {



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