Merge remote-tracking branch 'richardgl/bug_34345'

src/chrome/locale/en-US/network-settings.dtd

@@ -66,6 +66,9 @@
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
 <!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.quickstart "Quickstart">
+<!ENTITY torPreferences.quickstartDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world. Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
 <!ENTITY torPreferences.useBridge "Use a bridge">

src/defaults/preferences/torlauncher-prefs.js

@@ -4,6 +4,7 @@ pref("extensions.torlauncher.prompt_for_locale", true);
 
 pref("extensions.torlauncher.start_tor", true);
 pref("extensions.torlauncher.prompt_at_startup", true);
+pref("extensions.torlauncher.quickstart", false);
 
 // This pref controls whether Tor Launcher will try to remove the old
 // meek and moat http helper browser profiles. This only has an effect