[tbb-commits] [tor-launcher/master] Merge remote-tracking branch 'pc/bug34164-01'

[gk at torproject.org]

commit 1807842bcbb1bf2d9a72e79d5da07ee401363b68
Merge: b4838d3 98f3df1
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Jun 10 18:43:18 2020 +0000

    Merge remote-tracking branch 'pc/bug34164-01'

 .../{localePicker.xul => localePicker.xhtml}       | 16 +++-
 src/chrome/content/network-settings-shared.js      | 10 +--
 ...gs-wizard.xul => network-settings-wizard.xhtml} | 19 +++--
 src/chrome/content/network-settings.js             | 92 +++++++++++++---------
 ...network-settings.xul => network-settings.xhtml} | 15 ++--
 src/chrome/skin/network-settings.css               | 27 ++-----
 src/components/tl-process.js                       | 22 +++++-
 src/components/tl-protocol.js                      |  2 +-
 src/install.rdf                                    |  3 -
 9 files changed, 120 insertions(+), 86 deletions(-)