commit e44be49b35060f6ae17230bbc63bd617126843ee Merge: 053c9869 095cf949 Author: Georg Koppen gk@torproject.org Date: Fri Apr 26 09:32:49 2019 +0000

Merge remote-tracking branch 'acat/30115+1'

src/chrome/content/tor-circuit-display.js | 29 +++++++++++++++--------- src/chrome/content/torbutton.js | 37 +++++++------------------------ src/modules/utils.js | 35 +++++++++++++++++++++++++++-- 3 files changed, 59 insertions(+), 42 deletions(-)