commit 287d6bbc24a94dd321731deb27e553920fc864fa Merge: 280556dc26c9 b0faf995b30b Author: Matthew Finkel sysrqb@torproject.org Date: Thu Jun 24 16:44:00 2021 +0000

Merge remote-tracking branch 'richardgl/40481' into tor-browser-78.11.0esr-10.5-1

.../components/torconnect/content/aboutTorConnect.js | 2 +- browser/components/torpreferences/content/torPane.js | 20 ++++++++++++-------- .../components/torpreferences/content/torPane.xhtml | 9 ++++++++- browser/modules/TorStrings.jsm | 2 +- 4 files changed, 22 insertions(+), 11 deletions(-)

diff --cc browser/components/torconnect/content/aboutTorConnect.js index 02ea82433a37,657427767629..1c574a5d07c9 --- a/browser/components/torconnect/content/aboutTorConnect.js +++ b/browser/components/torconnect/content/aboutTorConnect.js @@@ -98,9 -98,8 +98,9 @@@ class AboutTorConnect setInitialUI() { this.setTitle(this.torStrings.torConnect.torConnect); this.elemProgressDesc.textContent = - this.torStrings.settings.quickstartDescription; + this.torStrings.settings.torPreferencesDescription; this.showElem(this.elemConnectButton); + this.elemConnectButton.focus(); this.showElem(this.elemAdvancedButton); this.hideElem(this.elemCopyLogLink); this.hideElem(this.elemCancelButton);