commit 078ae18e5f1cbf888e7c86c8aecaa383a727bf0d Merge: 4f85cd27 dc187160 Author: Matthew Finkel <sysrqb@torproject.org> Date: Fri Feb 21 21:04:00 2020 +0000 Merge remote-tracking branch 'bradetpo/bug19757-02' chrome/locale/en-US/torbutton.dtd | 1 + chrome/locale/en-US/torbutton.properties | 12 +++++++++++ modules/tor-control-port.js | 36 ++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+)