[tbb-commits] [tor-browser/tor-browser-78.6.0esr-10.5-1] Merge remote-tracking branch 'gitlab/merge-requests/99' into tor-browser-78.6.0esr-10.5-1

[gk at torproject.org]

commit 7e6b108a126069fde05569f32492ab09be47faa7
Merge: 761d72b53dec 2e2aaa528d92
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Jan 12 08:27:29 2021 +0000

    Merge remote-tracking branch 'gitlab/merge-requests/99' into tor-browser-78.6.0esr-10.5-1

 browser/components/search/extensions/ddg-onion/manifest.json | 4 ++--
 browser/components/search/extensions/ddg/manifest.json       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)