[tbb-commits] [tor-browser/tor-browser-78.1.0esr-10.0-1] Merge remote-tracking branch 'gitlab/merge-requests/29' into tor-browser-78.1.0esr-10.0-1

[gk at torproject.org]

commit 236b57124c5bad238ff78d91c62d734cf387aca3
Merge: 8ebe00420de7 bad0647c6b70
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Aug 13 08:46:51 2020 +0000

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

 browser/app/profile/000-tor-browser.js        | 48 ++++++++++++++++++++++++++-
 mobile/android/app/000-tor-browser-android.js |  3 ++
 2 files changed, 50 insertions(+), 1 deletion(-)