[tbb-commits] [tor-browser/tor-browser-78.11.0esr-11.0-1] Merge remote-tracking branch 'boklmgl/bug_40524' into tor-browser-78.11.0esr-11.0-1

[sysrqb at torproject.org]

commit 1cf4f3d0d4f448b915f7c68c802c59440fe366f4
Merge: 76a187284dd4 3be66d9d8f5e
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Tue Jul 13 23:33:19 2021 +0000

    Merge remote-tracking branch 'boklmgl/bug_40524' into tor-browser-78.11.0esr-11.0-1

 browser/app/permissions                                      | 2 +-
 browser/components/search/extensions/ddg-onion/manifest.json | 6 +++---
 browser/extensions/onboarding/content/Onboarding.jsm         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)