commit 248204701c25ed3250bd9b7ca827d2d0e41ad310 Merge: ce150c56 01366d7b Author: Matthew Finkel sysrqb@torproject.org Date: Tue Mar 24 15:23:15 2020 +0000

Merge remote-tracking branch 'bradetpo/bug33482-01'

chrome/content/aboutTor/aboutTor.xhtml | 2 +- chrome/locale/en-US/aboutTor.dtd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)