commit c366446e5eebb9e8acedae7ccef558dc541aedec Merge: f3cfdde e5b0e02 Author: Matthew Finkel sysrqb@torproject.org Date: Wed May 12 20:33:27 2021 +0000

Merge remote-tracking branch 'richardgl/27476_rev2'

src/chrome/locale/en-US/network-settings.dtd | 9 +++++++++ src/chrome/locale/en-US/torlauncher.properties | 2 ++ src/components/tl-process.js | 6 +++++- src/modules/tl-util.jsm | 15 +++++++++++++++ 4 files changed, 31 insertions(+), 1 deletion(-)