[tor-commits] [tor-browser/tor-browser-78.0.1esr-10.0-1] Merge remote-tracking branch 'gitlab/merge-requests/12' into tor-browser-78.0.1esr-10.0-1

[gk at torproject.org]

commit 1b532965f56fc56ab2a0479ad3baa6bbada1f6c0
Merge: 85acef9c943c a2463b202cf2
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Jul 23 22:10:48 2020 +0000

    Merge remote-tracking branch 'gitlab/merge-requests/12' into tor-browser-78.0.1esr-10.0-1

 browser/base/content/aboutDialog-appUpdater-legacy.js | 2 +-
 browser/components/BrowserContentHandler.jsm          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)