commit 85acef9c943c21f361ada8b11c95f9830d4fadc6 Merge: 13052ed2adcf c6b4574daf4b Author: Georg Koppen gk@torproject.org Date: Thu Jul 23 22:09:37 2020 +0000

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

browser/confvars.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)