[tbb-commits] [tor-browser-build/master] Merge remote-tracking branch 'acatgl/40128+1'

[sysrqb at torproject.org]

commit b481a5d3f506cf97f10d71c2dc3d64013e792742
Merge: fe18531 4e9e1d2
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Thu Dec 3 16:40:03 2020 +0000

    Merge remote-tracking branch 'acatgl/40128+1'

 projects/tor-browser/allowed_addons.json      | 3266 +++++++++++++++++++++++++
 projects/tor-browser/build.android            |   13 +-
 projects/tor-browser/config                   |    5 +
 projects/tor-browser/verify_allowed_addons.py |   52 +
 tools/fetch_allowed_addons.py                 |   43 +
 5 files changed, 3377 insertions(+), 2 deletions(-)