commit bb1bff811c12fd8638ebede1514be512a9a4fbd7 Merge: cb34de3 6ceda2e Author: Matthew Finkel sysrqb@torproject.org Date: Fri Feb 21 21:06:02 2020 +0000

Merge remote-tracking branch 'bradetpo/bug19757-02'

src/chrome/locale/en-US/torlauncher.properties | 3 ++- src/components/tl-process.js | 7 ++++++- src/modules/tl-util.jsm | 13 ++++++++++++- 3 files changed, 20 insertions(+), 3 deletions(-)