[tor-commits] [tor-browser/tor-browser-78.11.0esr-10.5-1] Merge branch 'bug_40499_00' into tor-browser-78.11.0esr-10.5-1

[sysrqb at torproject.org]

commit 90888c0908db001a50e53da97e6cf0f3e9ebda71
Merge: 36f2bff7dd1e 152563c8869e
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Thu Jul 1 14:29:31 2021 +0000

    Merge branch 'bug_40499_00' into tor-browser-78.11.0esr-10.5-1

 browser/components/BrowserGlue.jsm       | 5 +++--
 toolkit/mozapps/update/UpdateService.jsm | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)