commit e54639aab0c60274c14809cd9129b534bb79f92c Author: Kathy Brade brade@pearlcrescent.com Date: Thu Oct 10 09:21:46 2019 -0400

Bug 31910: Replace meek_lite with meek in circuit display --- chrome/content/tor-circuit-display.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js index d21b0770..f75bd781 100644 --- a/chrome/content/tor-circuit-display.js +++ b/chrome/content/tor-circuit-display.js @@ -290,8 +290,13 @@ let updateCircuitDisplay = function () { for (let i = 0; i < nodeData.length; ++i) { let relayText; if (nodeData[i].type === "bridge") { - relayText = uiString("tor_bridge") + - ((nodeData[i].bridgeType !== "vanilla") ? `: ${nodeData[i].bridgeType}` : ""); + relayText = uiString("tor_bridge"); + let bridgeType = nodeData[i].bridgeType; + if (bridgeType === "meek_lite") { + relayText += ": meek"; + } else if (bridgeType !== "vanilla") { + relayText += ": " + bridgeType; + } } else { relayText = localizedCountryNameFromCode(nodeData[i].countryCode); }