Unverified Commit 90888c09 authored by Matthew Finkel's avatar Matthew Finkel
Browse files

Merge branch 'bug_40499_00' into tor-browser-78.11.0esr-10.5-1

parents 36f2bff7 152563c8
...@@ -2514,8 +2514,9 @@ BrowserGlue.prototype = { ...@@ -2514,8 +2514,9 @@ BrowserGlue.prototype = {
{ {
task: () => { task: () => {
if (TorProtocolService.isBootstrapDone()) { if (TorProtocolService.isBootstrapDone() || !TorProtocolService.ownsTorDaemon) {
// we will take this path when the user is using the legacy tor launcher // we will take this path when the user is using the legacy tor launcher or
// when Tor Browser didn't launch its own tor.
OnionAliasStore.init(); OnionAliasStore.init();
} else { } else {
// this path is taken when using about:torconnect, we wait to init // this path is taken when using about:torconnect, we wait to init
......
...@@ -2698,8 +2698,10 @@ UpdateService.prototype = { ...@@ -2698,8 +2698,10 @@ UpdateService.prototype = {
} }
return; return;
} else if (update.errorCode == PROXY_SERVER_CONNECTION_REFUSED && } else if (update.errorCode == PROXY_SERVER_CONNECTION_REFUSED &&
!TorProtocolService.isBootstrapDone()) { !TorProtocolService.isBootstrapDone() &&
// Register boostrap observer to try again TorProtocolService.ownsTorDaemon) {
// Register boostrap observer to try again, but only when we own the
// tor process.
this._registerBootstrapObserver(); this._registerBootstrapObserver();
return; return;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment