commit 5488b6499042b74a36b7aafec2b4b2e755ef4390 Merge: 19d57bc2c04e fc22d11226d7 Author: Matthew Finkel sysrqb@torproject.org Date: Wed Jun 30 19:32:53 2021 +0000

Merge remote-tracking branch 'richardgl/40490' into tor-browser-78.11.0esr-10.5-1

browser/base/content/aboutNetError.js | 5 +-- browser/components/BrowserGlue.jsm | 22 ++++++---- browser/components/torconnect/TorConnectParent.jsm | 11 ----- browser/modules/TorConnect.jsm | 47 ++++++++++++++++++++++ browser/modules/moz.build | 1 + toolkit/mozapps/update/UpdateService.jsm | 43 ++++++++++++++++++++ toolkit/xre/nsAppRunner.cpp | 7 +--- 7 files changed, 108 insertions(+), 28 deletions(-)