[tbb-commits] [tor-browser/tor-browser-78.2.0esr-10.0-1] Merge remote-tracking branch 'gitlab/merge-requests/38' into tor-browser-78.2.0esr-10.0-1

commit 4e14e8b6d6bb1bb3a9a43a9ff5af1a6edcdbcc0b Merge: ee9af3088c44 76ee81e0323d Author: Georg Koppen gk@torproject.org Date: Thu Aug 20 13:21:14 2020 +0000

Merge remote-tracking branch 'gitlab/merge-requests/38' into tor-browser-78.2.0esr-10.0-1

.../torpreferences/content/requestBridgeDialog.jsm | 40 ++++++---------------- .../content/requestBridgeDialog.xhtml | 20 +++++------ .../torpreferences/content/torLogDialog.jsm | 3 +- .../torpreferences/content/torLogDialog.xhtml | 13 +++---- 4 files changed, 30 insertions(+), 46 deletions(-)