commit b15da273aa1c6de5a1725e24a171ad043864bf69 Merge: 9aa5fd4 51c1dfb Author: Georg Koppen gk@torproject.org Date: Wed May 23 18:07:50 2018 +0000

Merge remote-tracking branch 'sysrqb/bug25750_6'

src/chrome/content/network-settings.js | 3 +- src/components/tl-process.js | 31 +++++++-- src/components/tl-protocol.js | 25 ++++---- src/install.rdf | 8 +++ src/modules/tl-logger.jsm | 6 +- src/modules/tl-util.jsm | 114 ++++++++++++++++++++++++++++++++- 6 files changed, 163 insertions(+), 24 deletions(-)