commit b2d4c6348cb7cc604ef705b04837baf5db59041f Merge: 751a8d02 e6fb19bf Author: Matthew Finkel sysrqb@torproject.org Date: Fri Apr 3 02:16:11 2020 +0000

Merge remote-tracking branch 'acat/28005+2'

chrome/content/tor-circuit-display.js | 34 ++++++++++++++++++++++++++++++-- chrome/locale/en-US/torbutton.properties | 2 ++ chrome/skin/tor-circuit-display.css | 26 ++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 2 deletions(-)