[tor-commits] [tor-browser/tor-browser-68.8.0esr-9.5-1] Merge remote-tracking branch 'acatgh/34196+1' into tor-browser-68.8.0esr-9.5-1

[sysrqb at torproject.org]

commit 2e16915ff1a6933090dfb47e6fc876ea056cf07c
Merge: 4acec7610371 00f5a4c995a9
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Thu May 14 22:55:43 2020 +0000

    Merge remote-tracking branch 'acatgh/34196+1' into tor-browser-68.8.0esr-9.5-1

 browser/base/content/browser-siteIdentity.js | 12 +++++++-----
 browser/base/content/browser.js              |  3 ++-
 2 files changed, 9 insertions(+), 6 deletions(-)