commit 4c72d3fced61c72023621996682995ad5bf74e7e Merge: 230b6a13 667a0deb Author: Matthew Finkel sysrqb@torproject.org Date: Wed Jan 20 04:42:03 2021 +0000

Merge remote-tracking branch 'acatgl/revert_eoy2020_maint' into maint-10.0

LICENSE | 117 - chrome/content/aboutTor/aboutTor-content.js | 18 - chrome/content/aboutTor/aboutTor.xhtml | 26 +- chrome/locale/en-US/aboutTor.dtd | 1 - chrome/skin/aboutTor.css | 131 +- chrome/skin/aboutTorFonts.css | 16 - chrome/skin/illo-purple.svg | 9610 --------------------------- chrome/skin/illo.svg | 9610 --------------------------- chrome/skin/tape-purple.svg | 981 --- chrome/skin/tape.svg | 981 --- 10 files changed, 5 insertions(+), 21486 deletions(-)