commit 9e706c1c63b914941a9e63472b7892427660d300 Merge: 717430b7 86adebdc Author: Georg Koppen gk@torproject.org Date: Wed Aug 22 06:10:15 2018 +0000

Merge remote-tracking branch 'igt0/26884-v6'

src/chrome/content/aboutTor/aboutTor-content.js | 4 +- src/chrome/content/preferences-mobile.js | 76 ++++++++++++++++++++++ src/chrome/content/preferences.js | 4 +- src/chrome/content/preferences.xhtml | 85 +++++++++++++++++++++++++ src/chrome/content/tor-circuit-display.js | 4 +- src/chrome/content/torbutton.js | 78 +++++++++++++++-------- src/chrome/locale/en/torbutton.properties | 1 + src/chrome/skin/preferences-mobile.css | 47 ++++++++++++++ src/install.rdf | 1 - src/modules/utils.js | 10 ++- 10 files changed, 274 insertions(+), 36 deletions(-)