commit d54c4f1cf20e6166280e37567f7fa362ec596923 Merge: 1eaade2adee6 73d57c01c2bf Author: Matthew Finkel sysrqb@torproject.org Date: Thu Jul 22 17:45:34 2021 +0000
Merge remote-tracking branch 'richardgl/geolocation_refactor' into tor-browser-78.12.0esr-11.0-1
browser/actors/NetErrorParent.jsm | 6 +- browser/base/content/browser.js | 5 +- browser/components/BrowserGlue.jsm | 32 +- browser/components/torconnect/TorConnectParent.jsm | 200 +++++---- .../torconnect/content/aboutTorConnect.js | 466 +++++++++----------- .../torconnect/content/aboutTorConnect.xhtml | 9 - .../torconnect/content/torBootstrapUrlbar.js | 195 ++++----- .../components/torpreferences/content/torPane.js | 8 +- browser/components/urlbar/UrlbarInput.jsm | 6 +- browser/modules/TorConnect.jsm | 477 +++++++++++++++++++-- browser/modules/TorProtocolService.jsm | 101 +++-- .../processsingleton/MainProcessSingleton.jsm | 5 + toolkit/modules/RemotePageAccessManager.jsm | 28 +- 13 files changed, 941 insertions(+), 597 deletions(-)