This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch tor-browser-102.4.0esr-12.0-2 in repository tor-browser.

The following commit(s) were added to refs/heads/tor-browser-102.4.0esr-12.0-2 by this push: new 1002900e2f0b fixup! Bug 40933: Add tor-launcher functionality 1002900e2f0b is described below

commit 1002900e2f0bde0eb03b6b15c50ffe52a67acf3e Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Fri Oct 28 18:02:37 2022 +0200

fixup! Bug 40933: Add tor-launcher functionality

Bug 41409: make TorMonitorService.isRunning return true only when we have a working connection --- toolkit/components/tor-launcher/TorMonitorService.jsm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/toolkit/components/tor-launcher/TorMonitorService.jsm b/toolkit/components/tor-launcher/TorMonitorService.jsm index 27572c30370f..5a8f1e77b909 100644 --- a/toolkit/components/tor-launcher/TorMonitorService.jsm +++ b/toolkit/components/tor-launcher/TorMonitorService.jsm @@ -178,9 +178,7 @@ const TorMonitorService = { },

get isRunning() { - return this.ownsTorDaemon - ? !!this._torProcess?.isRunning - : !!this._connection; + return !!this._connection; },

// Private methods @@ -236,6 +234,7 @@ const TorMonitorService = { // FIXME: TorProcess is misleading here. We should use a topic related // to having a control port connection, instead. Services.obs.notifyObservers(null, TorTopics.ProcessIsReady); + logger.info(`Notified ${TorTopics.ProcessIsReady}`);

// We reset this here hoping that _shutDownEventMonitor can interrupt // the current monitor, either by calling clearTimeout and preventing it