commit 4613dcbd5e923a1c20f498d76b2f0bd76b35b951 Merge: 3e71b0d c382d84 Author: Nicolas Vigier boklm@torproject.org Date: Wed Apr 1 22:49:49 2020 +0200

Merge remote-tracking branch 'sysrqb/bug_33771-01'

.../Bundle-Data/Docs/Licenses/HTTPS-Everywhere.txt | 41 +-- .../Bundle-Data/Docs/Licenses/Libevent.txt | 99 ++++++ .../Bundle-Data/Docs/Licenses/NoScript.txt | 356 +-------------------- .../tor-browser/Bundle-Data/Docs/Licenses/Tor.txt | 275 +++++++++++++++- 4 files changed, 396 insertions(+), 375 deletions(-)