[tor-commits] [tor-browser/tor-browser-78.11.0esr-10.5-1] Merge remote-tracking branch 'richardgl/34345_dev' into tor-browser-78.11.0esr-10.5-1

[sysrqb at torproject.org]

commit 0ec919bf414fb5626c63483c41844444b33d96ad
Merge: eefcc076bae9 a4e2202fedb8
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Thu Jun 10 20:12:42 2021 +0000

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

 browser/components/torconnect/TorConnectParent.jsm | 14 ++++++
 .../torconnect/content/aboutTorConnect.css         |  4 ++
 .../torconnect/content/aboutTorConnect.js          | 50 ++++++++++++++++++++--
 .../torconnect/content/aboutTorConnect.xhtml       |  5 +++
 .../components/torpreferences/content/torPane.js   | 45 ++++++++++++++++---
 .../torpreferences/content/torPane.xhtml           | 10 +++--
 browser/modules/TorStrings.jsm                     |  3 ++
 toolkit/modules/AsyncPrefs.jsm                     |  2 +
 toolkit/modules/RemotePageAccessManager.jsm        |  7 +++
 9 files changed, 129 insertions(+), 11 deletions(-)