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

[sysrqb@xxxxxxxxxxxxxx]

commit ca636f7fea97c6e05f226eee0c3b535d94fd261b
Merge: 0ec919bf414f d27a43d5986f
Author: Matthew Finkel <sysrqb@xxxxxxxxxxxxxx>
Date:   Thu Jun 17 15:51:11 2021 +0000

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

 browser/base/content/aboutNetError.js              |  7 +-
 browser/components/torconnect/TorConnectParent.jsm | 11 +++
 .../torconnect/content/aboutTorConnect.css         | 73 ++++++++++------
 .../torconnect/content/aboutTorConnect.js          | 96 +++++++++++-----------
 .../torconnect/content/aboutTorConnect.xhtml       | 13 +--
 .../torconnect/content/torconnect-urlbar.css       | 12 ++-
 .../components/torpreferences/content/torPane.js   |  3 +-
 browser/components/urlbar/UrlbarInput.jsm          | 31 +++++++
 toolkit/modules/RemotePageAccessManager.jsm        |  3 +
 toolkit/xre/nsAppRunner.cpp                        |  7 +-
 10 files changed, 178 insertions(+), 78 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits