- tbb-commits - lists.torproject.org

[torbutton/master] Include changelogs from maint-1.9.3
by gk＠torproject.org 21 Jan '16

21 Jan '16

commit 0cd72154dd04a4d15567f4585a6607cfb2d4ece6 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 21 11:05:24 2016 +0000 Include changelogs from maint-1.9.3 --- src/CHANGELOG | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 2d8647f..c56939d 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -23,6 +23,21 @@ * Bug 16797: brandShorterName is missing from brand.properties * Translation updates +1.9.3.7 + * Bug 16990: Avoid matching '250 ' to the end of node name + * Bug 17565: Tor fundraising campaign donation banner + * Bug 17770: Fix alignments on donation banner + * Bug 17792: Include donation banner in some non en-US Tor Browsers + * Translation updates + +1.9.3.5 + * Bug 9623: Spoof Referer when leaving a .onion domain + * Bug 16735: about:tor should accommodate different fonts/font sizes + * Bug 16937: Don't translate the hompepage/spellchecker dictionary string + * Bug 17164: Don't show text-select cursor on circuit display + * Bug 17351: Remove unused code + * Translation updates + 1.9.3.4 * Bug 16887: Update intl.accept_languages value * Bug 15493: Update circuit display on new circuit info

1 0

[tor-browser/tor-browser-38.5.0esr-5.5-2] fixup! Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent
by gk＠torproject.org 21 Jan '16

21 Jan '16

commit 1ad4ed85948e5814e46744cedd0b5a9b1707cac4 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Jan 20 17:51:46 2016 -0800 fixup! Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent --- dom/events/KeyCodeConsensus.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dom/events/KeyCodeConsensus.h b/dom/events/KeyCodeConsensus.h index 47d8341..e789326 100644 --- a/dom/events/KeyCodeConsensus.h +++ b/dom/events/KeyCodeConsensus.h @@ -181,15 +181,14 @@ static void createKeyCodes() KEY("8", Digit8, 56) KEY("9", Digit9, 57) - SHIFT("!", Digit0, 48) - SHIFT("@", Digit1, 49) - SHIFT("#", Digit2, 50) - SHIFT("$", Digit3, 51) - SHIFT("%", Digit4, 52) - SHIFT("^", Digit5, 53) - SHIFT("&", Digit6, 54) - SHIFT("*", Digit7, 55) - SHIFT("(", Digit8, 56) - SHIFT(")", Digit9, 57) - + SHIFT(")", Digit0, 48) + SHIFT("!", Digit1, 49) + SHIFT("@", Digit2, 50) + SHIFT("#", Digit3, 51) + SHIFT("$", Digit4, 52) + SHIFT("%", Digit5, 53) + SHIFT("^", Digit6, 54) + SHIFT("&", Digit7, 55) + SHIFT("*", Digit8, 56) + SHIFT("(", Digit9, 57) }

1 0

[tor-browser-bundle/hardened-builds] Bug 17917: Changelog after update is empty if JS is disabled
by gk＠torproject.org 21 Jan '16

21 Jan '16

commit 69c12f1a8817c35d2e815d3bd3ab090c2434f067 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Jan 15 11:30:13 2016 -0500 Bug 17917: Changelog after update is empty if JS is disabled Add about:tbupdate to NoScript's whitelist. --- .../Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Browser/profile.default/preferences/extension-overrides.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 83d4bbf..865398e 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -17,9 +17,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.default", "about: chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.mandatory", "about: chrome: resource: blob: mediasource: moz-safe-about:"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 83d4bbf..865398e 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -17,9 +17,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.default", "about: chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.mandatory", "about: chrome: resource: blob: mediasource: moz-safe-about:"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 83d4bbf..865398e 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -17,9 +17,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.default", "about: chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.mandatory", "about: chrome: resource: blob: mediasource: moz-safe-about:"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false);

1 0

[tor-browser-bundle/master] Bug 17917: Changelog after update is empty if JS is disabled
by gk＠torproject.org 21 Jan '16

21 Jan '16

commit 16b935d869a8673ceac199e3617873db34ae8f0b Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Jan 15 11:30:13 2016 -0500 Bug 17917: Changelog after update is empty if JS is disabled Add about:tbupdate to NoScript's whitelist. --- .../Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Browser/profile.default/preferences/extension-overrides.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 83d4bbf..865398e 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -17,9 +17,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.default", "about: chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.mandatory", "about: chrome: resource: blob: mediasource: moz-safe-about:"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 83d4bbf..865398e 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -17,9 +17,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.default", "about: chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.mandatory", "about: chrome: resource: blob: mediasource: moz-safe-about:"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 83d4bbf..865398e 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -17,9 +17,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.default", "about: chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.mandatory", "about: chrome: resource: blob: mediasource: moz-safe-about:"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false);

1 0

[torbutton/master] Bug 16990: Code cleanup
by gk＠torproject.org 21 Jan '16

21 Jan '16

commit 53299a96c848d806d490e3b7068d81be352d7620 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Jan 6 13:48:27 2016 -0800 Bug 16990: Code cleanup --- src/chrome/content/tor-circuit-display.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index d5ef3d3..c99d25d 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -141,7 +141,7 @@ let collectIsolationData = function (aController, updateUI) { knownCircuitIDs[streamEvent.CircuitID] = true; let circuitStatus = yield getCircuitStatusByID(aController, streamEvent.CircuitID), credentials = circuitStatus ? - (trimQuotes(circuitStatus.SOCKS_USERNAME) + ":" + + (trimQuotes(circuitStatus.SOCKS_USERNAME) + "|" + trimQuotes(circuitStatus.SOCKS_PASSWORD)) : null; if (credentials) { @@ -235,7 +235,7 @@ let getSOCKSCredentialsForBrowser = function (browser) { if (!(channel instanceof Ci.nsIProxiedChannel)) return null; let proxyInfo = channel.proxyInfo; if (proxyInfo === null) return null; - return proxyInfo.username + ":" + proxyInfo.password; + return [proxyInfo.username, proxyInfo.password]; }; // __onionSiteRelayLine__. @@ -251,11 +251,12 @@ let updateCircuitDisplay = function () { let credentials = getSOCKSCredentialsForBrowser(selectedBrowser), nodeData = null; if (credentials) { - // Check if we have anything to show for these credentials. - nodeData = credentialsToNodeDataMap[credentials]; + let [SOCKS_username, SOCKS_password] = credentials; + // Check if we have anything to show for these credentials. + nodeData = credentialsToNodeDataMap[SOCKS_username + "|" + SOCKS_password]; if (nodeData) { // Update the displayed domain. - let domain = credentials.split(":")[0]; + let domain = SOCKS_username; document.getElementById("domain").innerHTML = "(" + domain + "):"; // Update the displayed information for the relay nodes. let lines = nodeLines(nodeData), @@ -310,8 +311,9 @@ let syncDisplayWithSelectedTab = (function() { // ## Main function -// setupDisplay(host, port, password, enablePrefName)__. -// Returns a function that lets you start/stop automatic display of the Tor circuit. +// __setupDisplay(host, port, password, enablePrefName)__. +// Once called, the Tor circuit display will be started whenever +// the "enablePref" is set to true, and stopped when it is set to false. // A reference to this function (called createTorCircuitDisplay) is exported as a global. let setupDisplay = function (host, port, password, enablePrefName) { let myController = null,

1 0

[tor-browser-bundle/hardened-builds] Bug 18115: Adding new default obfs4 bridge "MaBishomarim" to the bottom.
by gk＠torproject.org 21 Jan '16

21 Jan '16

commit 8f65825303389fbb253a0fa263c7b977380e195b Author: Nima Fatemi <nima(a)torproject.org> Date: Thu Jan 21 06:28:18 2016 +0000 Bug 18115: Adding new default obfs4 bridge "MaBishomarim" to the bottom. --- Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 0121f6b..421e1aa 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -27,6 +27,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:105 pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.11:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[tor-browser-bundle/hardened-builds] Bug 18115: Adding new default obfs4 bridge "Mosaddegh"
by gk＠torproject.org 21 Jan '16

21 Jan '16

commit ae110f6f69659ea7aa830dcc8b1c8f3df815d0ec Author: Nima Fatemi <nima(a)torproject.org> Date: Thu Jan 21 06:17:45 2016 +0000 Bug 18115: Adding new default obfs4 bridge "Mosaddegh" --- Bundle-Data/PTConfigs/bridge_prefs.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index f79a7fc..0121f6b 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -20,12 +20,13 @@ pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte [2001:49f0:d00a:1: pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); -pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:41835 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[tor-browser-bundle/master] Bug 18115: Adding new default obfs4 bridge "MaBishomarim" to the bottom.
by gk＠torproject.org 21 Jan '16

21 Jan '16

commit eb0ea02833c240188d815820c1de72a97776d712 Author: Nima Fatemi <nima(a)torproject.org> Date: Thu Jan 21 06:28:18 2016 +0000 Bug 18115: Adding new default obfs4 bridge "MaBishomarim" to the bottom. --- Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 0121f6b..421e1aa 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -27,6 +27,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:105 pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.11:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[tor-browser-bundle/master] Bug 18115: Adding new default obfs4 bridge "Mosaddegh"
by gk＠torproject.org 21 Jan '16

21 Jan '16

commit bf09e53ce3752e086b5d6fde1a09f480f020e115 Author: Nima Fatemi <nima(a)torproject.org> Date: Thu Jan 21 06:17:45 2016 +0000 Bug 18115: Adding new default obfs4 bridge "Mosaddegh" --- Bundle-Data/PTConfigs/bridge_prefs.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index f79a7fc..0121f6b 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -20,12 +20,13 @@ pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte [2001:49f0:d00a:1: pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); -pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:41835 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[tor-launcher/master] Bug 11773: setup wizard UI flow improvements
by gk＠torproject.org 20 Jan '16

20 Jan '16

commit e18194b1622b4d8ef1b7a9674b63d1213e678199 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jan 20 11:42:12 2016 -0500 Bug 11773: setup wizard UI flow improvements Add a new "Reconfigure" prompt that is displayed after bootstrapping fails. This makes it so users experience the same configuration sequence each time rather than forcing them to move backwards through the wizard pages. Add a new "Remove Settings and Connect" prompt that is displayed if the user clicks "Connect" while some bridge or proxy settings are present. This avoids a problem where old settings may be used without users being aware of them. Improve some of the configuration prompts and status text based on early feedback from UC Berkeley usability studies. --- src/chrome/content/network-settings-wizard.xul | 48 ++++++- src/chrome/content/network-settings.js | 165 +++++++++++++++++++----- src/chrome/content/network-settings.xul | 2 +- src/chrome/content/progress.js | 2 + src/chrome/locale/en/network-settings.dtd | 15 ++- src/chrome/locale/en/progress.dtd | 2 +- src/chrome/skin/network-settings.css | 3 +- 7 files changed, 189 insertions(+), 48 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 00c1682..56217c5 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -19,7 +19,7 @@ windowtype="TorLauncher:NetworkSettings" persist="screenX screenY" buttonlabelextra2="&torsettings.copyLog;" - onwizardfinish="return applySettings();" + onwizardfinish="return applySettings(false);" onwizardcancel="return onCancel();" onload="initDialog();" onunload="deinitDialog();"> @@ -46,7 +46,8 @@ <separator/> <label>&torSettings.connectPrompt2;</label> <label>&torSettings.connectPrompt3;</label> - <button label="&torSettings.connect;" oncommand="useSettings();"/> + <button label="&torSettings.connect;" + oncommand="onWizardFirstPanelConnect();"/> <separator class="tall"/> <label>&torSettings.configurePrompt1;</label> <label>&torSettings.configurePrompt2;</label> @@ -74,7 +75,9 @@ <radio id="bridgesRadioYes" label="&torSettings.yes;" /> <radio id="bridgesRadioNo" label="&torSettings.no;" selected="true" /> </radiogroup> - <description class="questionHelp">&torSettings.bridgeHelp; + <description class="questionHelp">&torSettings.bridgeExplanation1; + </description> + <description class="questionHelp">&torSettings.bridgeExplanation2; </description> </vbox> </hbox> @@ -94,7 +97,8 @@ <separator /> <vbox> <label id="bridgeSettingsPrompt" - class="question">&torSettings.bridgeSettingsPrompt;</label> + class="question">&torSettings.bridgeSettingsPrompt;  +&torsettings.useBridges.note;</label> <groupbox id="bridgeSpecificSettings" /> </vbox> </wizardpage> @@ -120,7 +124,9 @@ <radio id="proxyRadioYes" label="&torSettings.yes;" /> <radio id="proxyRadioNo" label="&torSettings.no;" selected="true" /> </radiogroup> - <description class="questionHelp">&torSettings.proxyHelp; + <description class="questionHelp">&torSettings.proxyExplanation1; + </description> + <description class="questionHelp">&torSettings.proxyExplanation2; </description> </vbox> </hbox> @@ -168,8 +174,36 @@ <separator/> <hbox> <spring flex="1" /> - <button id="restartTorButton" label="&torsettings.restartTor;" hidden="true" - oncommand="onRestartTor()" /> + <button id="restartTorButton" label="&torsettings.restartTor;" + hidden="true" oncommand="onRestartTor()" /> + <button id="reconfigTorButton" label="&torsettings.reconfigTor;" + hidden="true" oncommand="onWizardReconfig()" /> + <spring flex="1" /> + </hbox> + <spring flex="1" /> + </wizardpage> + + <wizardpage pageid="discardSettings" next="notUsed" + onpageshow="showWizardNavButtons(false);" + onextra2="onCopyLog();"> + <hbox class="tbb-header"> + <vbox class="tbb-logo-box" align="start"> + <image class="tbb-logo" /> + </vbox> + </hbox> + <spring flex="1" /> + <hbox> + <spring flex="1" /> + <description flex="1">&torsettings.discardSettings.prompt;</description> + <spring flex="1" /> + </hbox> + <separator/> + <hbox> + <spring flex="1" /> + <button id="discardSettingsGoBack" oncommand="showPanel();"/> + <separator/> + <button label="&torsettings.discardSettings.proceed;" + oncommand="removeSettingsAndConnect()" /> <spring flex="1" /> </hbox> <spring flex="1" /> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 9d3cb60..d145f77 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -35,6 +35,8 @@ const kTorLogHasWarnOrErrTopic = "TorLogHasWarnOrErr"; const kWizardProxyRadioGroup = "proxyRadioGroup"; const kWizardUseBridgesRadioGroup = "useBridgesRadioGroup"; +const kWizardFirstPageID = "first"; + const kLocaleList = "localeList"; const kUseProxyCheckbox = "useProxy"; const kProxyTypeMenulist = "proxyType"; @@ -200,6 +202,12 @@ function initDialog() if (accessKey) helpBtn.setAttribute("accesskey", accessKey); } + + // Set Discard Settings back button label to match the wizard Back button. + let wizardBackBtn = document.documentElement.getButton("back"); + let backBtn = document.getElementById("discardSettingsGoBack"); + if (wizardBackBtn && backBtn) + backBtn.label = wizardBackBtn.label; } initDefaultBridgeTypeMenu(); @@ -214,7 +222,7 @@ function initDialog() (status != gTorProcessService.kStatusRunning)) { if (status == gTorProcessService.kStatusExited) - showErrorMessage(true, null); + showErrorMessage(true, null, false); else showStartingTorPanel(); addObserver(kTorProcessReadyTopic); @@ -384,6 +392,25 @@ function getWizard() } +function onWizardFirstPanelConnect() +{ + // If the user configured bridge or proxy settings, prompt before + // discarding their data. + if (isBridgeConfigured() || isProxyConfigured()) + showPanel("discardSettings"); + else + removeSettingsAndConnect() +} + + +function removeSettingsAndConnect() +{ + applySettings(true); // Use default settings. + if (!gIsBootstrapComplete) + readTorSettings(); // Ensure UI matches the settings that were used. +} + + function onWizardConfigure() { getWizard().advance("bridges"); @@ -497,12 +524,12 @@ var gObserver = { { removeObserver(kTorProcessReadyTopic); removeObserver(kTorProcessDidNotStartTopic); - showErrorMessage(false, aData); + showErrorMessage(false, aData, false); } else if (kTorProcessExitedTopic == aTopic) { removeObserver(kTorProcessExitedTopic); - showErrorMessage(true, null); + showErrorMessage(true, null, false); } else if (kTorOpenProgressTopic == aTopic) { @@ -560,7 +587,7 @@ function readTorSettings() if (!didSucceed) { // Unable to communicate with tor. Hide settings and display an error. - showErrorMessage(false, null); + showErrorMessage(false, null, false); setTimeout(function() { @@ -581,7 +608,7 @@ function showPanel(aPanelID) { var wizard = getWizard(); if (!aPanelID) - aPanelID = (wizard) ? "first" : "settings"; + aPanelID = (wizard) ? kWizardFirstPageID : "settings"; var deckElem = document.getElementById("deck"); if (deckElem) @@ -589,7 +616,7 @@ function showPanel(aPanelID) else if (wizard.currentPage.pageid != aPanelID) wizard.goTo(aPanelID); - if (wizard && (aPanelID == "first")) + if (wizard && (aPanelID == kWizardFirstPageID)) setTimeout( function() { showWizardNavButtons(false); }, 0); showOrHideButton("accept", (aPanelID == "settings"), true); @@ -627,7 +654,7 @@ function showStartingTorPanel() } -function showErrorMessage(aTorExited, aErrorMsg) +function showErrorMessage(aTorExited, aErrorMsg, aShowReconfigButton) { var elem = document.getElementById("errorPanelMessage"); var btn = document.getElementById("restartTorButton"); @@ -653,6 +680,15 @@ function showErrorMessage(aTorExited, aErrorMsg) if (elem) elem.textContent = (aErrorMsg) ? aErrorMsg : ""; + let reconfigBtn = document.getElementById("reconfigTorButton"); + if (reconfigBtn) + { + if (aShowReconfigButton) + reconfigBtn.removeAttribute("hidden"); + else + reconfigBtn.setAttribute("hidden", true); + } + showPanel("errorPanel"); var haveWizard = (getWizard() != null); @@ -856,6 +892,17 @@ function onRestartTor() } +function onWizardReconfig() +{ + showPanel(kWizardFirstPageID); + onWizardConfigure(); + // Because a similar delayed call is used to hide the buttons when the + // first wizard page is displayed, we use setTimeout() here to ensure + // that the navigation buttons are visible. + window.setTimeout(function() { showWizardNavButtons(true); }, 0); +} + + function onCancel() { if (gRestoreAfterHelpPanelID) // Is help open? @@ -927,7 +974,9 @@ function onOpenHelp() forAssistance.setAttribute("hidden", true); } else + { overrideButtonLabel("cancel", "done"); + } } @@ -948,7 +997,9 @@ function closeHelp() forAssistance.removeAttribute("hidden"); } else + { restoreButtonLabel("cancel"); + } showPanel(gRestoreAfterHelpPanelID); gRestoreAfterHelpPanelID = null; @@ -1130,15 +1181,16 @@ function initBridgeSettings() // Returns true if settings were successfully applied. -function applySettings() +function applySettings(aUseDefaults) { TorLauncherLogger.log(2, "applySettings ---------------------" + "----------------------------------------------"); var didSucceed = false; try { - didSucceed = applyBridgeSettings() && - applyProxySettings() && applyFirewallSettings(); + didSucceed = applyBridgeSettings(aUseDefaults) && + applyProxySettings(aUseDefaults) && + applyFirewallSettings(aUseDefaults); } catch (e) { TorLauncherLogger.safelog(4, "Error in applySettings: ", e); } @@ -1164,10 +1216,26 @@ function useSettings() if (!gIsBootstrapComplete) openProgressDialog(); + let wizardElem = getWizard(); if (gIsBootstrapComplete) + { close(); + } + else if (wizardElem) + { + // If the user went down the "Configure" path and another error (e.g., + // Tor Exited) has not already been shown, display a generic message + // with a "Reconfigure" button. + let pageid = wizardElem.currentPage.pageid; + if ((pageid != kWizardFirstPageID) && (pageid != "errorPanel")) + { + let msg = TorLauncherUtil.getLocalizedString("tor_bootstrap_failed"); + showErrorMessage(false, msg, true); + } + } } + function openProgressDialog() { var chromeURL = "chrome://torlauncher/content/progress.xul"; @@ -1184,9 +1252,10 @@ function onProgressDialogClose(aBootstrapCompleted) // Returns true if settings were successfully applied. -function applyProxySettings() +function applyProxySettings(aUseDefaults) { - var settings = getAndValidateProxySettings(); + let settings = aUseDefaults ? getDefaultProxySettings() + : getAndValidateProxySettings(); if (!settings) return false; @@ -1194,34 +1263,40 @@ function applyProxySettings() } -// Return a settings object if successful and null if not. -function getAndValidateProxySettings() +function getDefaultProxySettings() { - // TODO: validate user-entered data. See Vidalia's NetworkPage::save() - - var settings = {}; + let settings = {}; settings[kTorConfKeySocks4Proxy] = null; settings[kTorConfKeySocks5Proxy] = null; settings[kTorConfKeySocks5ProxyUsername] = null; settings[kTorConfKeySocks5ProxyPassword] = null; settings[kTorConfKeyHTTPSProxy] = null; settings[kTorConfKeyHTTPSProxyAuthenticator] = null; + return settings; +} + + +// Return a settings object if successful and null if not. +function getAndValidateProxySettings() +{ + var settings = getDefaultProxySettings(); + // TODO: validate user-entered data. See Vidalia's NetworkPage::save() var proxyType, proxyAddrPort, proxyUsername, proxyPassword; if (isProxyConfigured()) { - proxyAddrPort = createColonStr(getElemValue(kProxyAddr, null), - getElemValue(kProxyPort, null)); - if (!proxyAddrPort) + proxyType = getElemValue(kProxyTypeMenulist, null); + if (!proxyType) { - reportValidationError("error_proxy_addr_missing"); + reportValidationError("error_proxy_type_missing"); return null; } - proxyType = getElemValue(kProxyTypeMenulist, null); - if (!proxyType) + proxyAddrPort = createColonStr(getElemValue(kProxyAddr, null), + getElemValue(kProxyPort, null)); + if (!proxyAddrPort) { - reportValidationError("error_proxy_type_missing"); + reportValidationError("error_proxy_addr_missing"); return null; } @@ -1268,10 +1343,16 @@ function reportValidationError(aStrKey) // Returns true if settings were successfully applied. -function applyFirewallSettings() +function applyFirewallSettings(aUseDefaults) { - var settings = (getWizard()) ? getAutoFirewallSettings() - : getAndValidateFirewallSettings(); + let settings; + if (aUseDefaults) + settings = getDefaultFirewallSettings(); + else if (getWizard()) + settings = getAutoFirewallSettings(); + else + settings = getAndValidateFirewallSettings(); + if (!settings) return false; @@ -1296,6 +1377,12 @@ function getAndValidateFirewallSettings() } +function getDefaultFirewallSettings() +{ + return constructFirewallSettings(undefined); +} + + // Return a settings object if successful and null if not. // Only used for the wizard. function getAutoFirewallSettings() @@ -1386,9 +1473,10 @@ function initDefaultBridgeTypeMenu() // Returns true if settings were successfully applied. -function applyBridgeSettings() +function applyBridgeSettings(aUseDefaults) { - var settings = getAndValidateBridgeSettings(); + let settings = (aUseDefaults) ? getDefaultBridgeSettings() + : getAndValidateBridgeSettings(); if (!settings) return false; @@ -1396,13 +1484,19 @@ function applyBridgeSettings() } -// Return a settings object if successful and null if not. -function getAndValidateBridgeSettings() +function getDefaultBridgeSettings() { - var settings = {}; + let settings = {}; settings[kTorConfKeyUseBridges] = null; settings[kTorConfKeyBridgeList] = null; + return settings; +} + +// Return a settings object if successful and null if not. +function getAndValidateBridgeSettings() +{ + var settings = getDefaultBridgeSettings(); var useBridges = isBridgeConfigured(); var defaultBridgeType; var bridgeList; @@ -1432,8 +1526,9 @@ function getAndValidateBridgeSettings() } } - // Since it returns a filterd list of bridges, TorLauncherUtil.defaultBridges - // must be called after setting the kPrefDefaultBridgeType pref. + // Since it returns a filtered list of bridges, + // TorLauncherUtil.defaultBridges must be called after setting the + // kPrefDefaultBridgeType pref. TorLauncherUtil.setCharPref(kPrefDefaultBridgeType, defaultBridgeType); if (defaultBridgeType) bridgeList = TorLauncherUtil.defaultBridges; @@ -1651,7 +1746,9 @@ function parseColonStr(aStr) rv[1] = aStr.substring(idx + 1); } else + { rv[0] = aStr; + } return rv; } diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index 9fffbec..727e7f6 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -20,7 +20,7 @@ persist="screenX screenY" buttons="accept,cancel,extra2,help" buttonlabelextra2="&torsettings.copyLog;" - ondialogaccept="return applySettings();" + ondialogaccept="return applySettings(false);" ondialogcancel="return onCancel();" ondialogextra2="onCopyLog();" ondialoghelp="onOpenHelp();" diff --git a/src/chrome/content/progress.js b/src/chrome/content/progress.js index b44dca5..48362e7 100644 --- a/src/chrome/content/progress.js +++ b/src/chrome/content/progress.js @@ -170,6 +170,8 @@ var gObserver = { // TODO: provide a way to access tor log e.g., leave this dialog open // and display the open settings button or provide a way to do // that from our error alerts. + if (kTorBootstrapErrorTopic == aTopic) + stopTorBootstrap(); cleanup(); window.close(); } diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index b193750..75ece3b 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -13,26 +13,32 @@ <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings."> +<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy."> +<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> +<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> <!ENTITY torSettings.enterProxy "Enter the proxy settings."> <!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> +<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> <!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.reconfigTor "Reconfigure"> + +<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> +<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> <!ENTITY torsettings.optional "Optional"> @@ -50,6 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> <!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> <!ENTITY torsettings.useBridges.default "Connect with provided bridges"> +<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> <!ENTITY torsettings.useBridges.type "Transport type:"> <!ENTITY torsettings.useBridges.custom "Enter custom bridges"> <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> diff --git a/src/chrome/locale/en/progress.dtd b/src/chrome/locale/en/progress.dtd index ebd9cef..9ac9ad7 100644 --- a/src/chrome/locale/en/progress.dtd +++ b/src/chrome/locale/en/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 610ab26..20d3528 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -72,7 +72,7 @@ separator.tall { } .questionHelp { - margin-right: 20px; + margin: 0px 0px 12px 20px; } .instructions { @@ -109,6 +109,7 @@ wizard#TorLauncherLocalePicker button[dlgtype="next"] { font-weight: bold; } +#bridgeNote, #bridgeDefaultEntry, #bridgeCustomEntry { margin-left: 1.8em;

1 0