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

[sysrqb at torproject.org]

commit d03456f9cd90665c20f146437962d6e8138cc754
Merge: 8157aa761f34 b61c939ceef2
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Thu Jun 24 00:41:34 2021 +0000

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

 browser/components/BrowserGlue.jsm                    | 19 ++++++++++++++++++-
 .../onionservices/HttpsEverywhereControl.jsm          | 17 ++++++++++++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)