March 2015 - tbb-commits - lists.torproject.org

[tor-browser-bundle/maint-4.0] TBB 4.0.6: Update changelog, versions, and update manifest.
by mikeperry＠torproject.org 26 Mar '15

26 Mar '15

commit a3798c52a08555e61782bc80d0e8935f4a8a7a0b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Mar 25 21:48:24 2015 -0700 TBB 4.0.6: Update changelog, versions, and update manifest. Because 4.0.5 and 4.0.6 were so close together, let's make incrementals from both 4.0.4 and 4.0.5. --- Bundle-Data/Docs/ChangeLog.txt | 5 +++++ gitian/versions | 8 ++++---- tools/update-responses/config.yml | 9 +++++---- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c8a2b5a..fa4b45d 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 4.0.6 -- Mar 31 2015 + * All Platforms + * Update Firefox to 31.6.0esr + * Update OpenSSL to 1.0.1m + Tor Browser 4.0.5 -- Mar 23 2015 * All Platforms * Update Firefox to 31.5.3esr diff --git a/gitian/versions b/gitian/versions index 14354af..d27d77c 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,10 +1,10 @@ -TORBROWSER_VERSION=4.0.5 +TORBROWSER_VERSION=4.0.6 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=31.5.3esr +FIREFOX_VERSION=31.6.0esr TORBROWSER_UPDATE_CHANNEL=release @@ -30,10 +30,10 @@ FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GITIAN_TAG=tor-browser-builder-3.x-7 -OPENSSL_VER=1.0.1l +OPENSSL_VER=1.0.1m GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=4.9.1 PYTHON_VER=2.7.5 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 93a372f..682f5cc 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -6,15 +6,16 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - release: 4.0.5 + release: 4.0.6 alpha: 4.5-alpha-2 versions: - 4.0.5: - platformVersion: 31.5.3 + 4.0.6: + platformVersion: 31.6.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.0.5 + download_url: https://www.torproject.org/dist/torbrowser/4.0.6 incremental_from: - 4.0.4 + - 4.0.5 4.5-alpha-2: platformVersion: 31.3.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en

1 0

[torbutton/master] Bug 7255: Address Pearl Crescent's review comments
by gk＠torproject.org 25 Mar '15

25 Mar '15

commit d2c3f9e7dae61b5f18b83398d234ab75186a3e99 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 25 20:14:37 2015 +0000 Bug 7255: Address Pearl Crescent's review comments --- src/chrome/content/torbutton.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 3158c04..83ea395 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -22,6 +22,9 @@ const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion" const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; +const k_tb_tor_resize_warn_pref = + "extensions.torbutton.startup_resize_period" + // status var m_tb_wasinited = false; var m_tb_prefs = false; @@ -1074,7 +1077,7 @@ function torbutton_on_abouttor_load(aDoc) { // OS-specific window maximization on start-up should be done by now. Disable // the respective preference to make sure the user is seeing our notification. - m_tb_prefs.setBoolPref("extensions.torbutton.startup_resize_period", false); + m_tb_prefs.setBoolPref(k_tb_tor_resize_warn_pref, false); } function torbutton_is_abouttor_doc(aDoc) { @@ -3427,9 +3430,9 @@ var torbutton_resizelistener = if (m_tb_resize_date === null) { m_tb_resize_date = Date.now(); } else { - // We at least another second before we show a new notification. - // Should be enough to rule out OSes that call our handler rapidly - // due to internal workings. + // We wait at least another second before we show a new + // notification. Should be enough to rule out OSes that call our + // handler rapidly due to internal workings. if (Date.now() - m_tb_resize_date < 1000) { return; } @@ -3471,7 +3474,7 @@ var torbutton_resizelistener = // maximize the window. We don't want to do that AND don't want to // show the user our notification in this case. if (m_tb_prefs. - getBoolPref("extensions.torbutton.startup_resize_period")) { + getBoolPref(k_tb_tor_resize_warn_pref)) { window.addEventListener("resize", function() { win.resizeBy(width - win.innerWidth, height - win.innerHeight); @@ -3506,8 +3509,7 @@ var torbutton_resizelistener = // the window triggers more than one resize event the first being not the // one we need. Thus we can't remove the listener after the first resize // event got fired. Thus, we have the rather klunky setTimeout() call. - m_tb_prefs.setBoolPref("extensions.torbutton.startup_resize_period", - true); + m_tb_prefs.setBoolPref(k_tb_tor_resize_warn_pref, true); window.addEventListener("sizemodechange", m_tb_resize_handler, false); // This is fun. any attempt to directly set the inner window actually

1 0

[torbutton/master] Bug 7255: Warn users about maximizing windows
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit 52ab4472601dfb9f0c6d83966a55178b33149464 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 25 15:45:49 2015 +0000 Bug 7255: Warn users about maximizing windows Maximized windows are very likely not rounded to multiples of 200x100. Nevertheless, it is probably not uncommen for users to maximize their windows as they are used to. We should at least warn them until a proper fix is in place (see #14429 for an idea). --- src/chrome/content/torbutton.js | 109 ++++++++++++++++++++++------- src/chrome/locale/en/torbutton.properties | 2 + src/defaults/preferences/preferences.js | 6 ++ 3 files changed, 93 insertions(+), 24 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 5eb704e..7e6149f 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -22,7 +22,6 @@ const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion" const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; - // status var m_tb_wasinited = false; var m_tb_prefs = false; @@ -1072,6 +1071,10 @@ function torbutton_on_abouttor_load(aDoc) { m_tb_prefs. setBoolPref("extensions.torbutton.show_slider_notification", false); } + + // OS-specific window maximization on start-up should be done by now. Disable + // the respective preference to make sure the user is seeing our notification. + m_tb_prefs.setBoolPref("extensions.torbutton.startup_resize_period", false); } function torbutton_is_abouttor_doc(aDoc) { @@ -3094,6 +3097,9 @@ function torbutton_close_window(event) { torbutton_tor_check_observer.unregister(); torbutton_console_observer.unregister(); + window.removeEventListener("sizemodechange", m_tb_resize_handler, + false); + // TODO: This is a real ghetto hack.. When the original window // closes, we need to find another window to handle observing // unique events... The right way to do this is to move the @@ -3301,6 +3307,9 @@ var torbutton_weblistener = { /*torbutton_eclog(1, 'called linkIcon'); */ return 0; } } +var m_tb_resize_handler = null; +var m_tb_resize_date = null; + // Bug 1506 P1/P3: Setting a fixed window size is important, but // probably not for android. var torbutton_resizelistener = @@ -3410,30 +3419,87 @@ var torbutton_resizelistener = height = Math.floor(maxHeight/100.0)*100; } - var handler = function() { + m_tb_resize_handler = function() { if (window.windowState === 1) { - window.addEventListener("resize", - function() { - win.resizeBy(width - win.innerWidth, height - win.innerHeight); - var calling_function = arguments.callee; - setTimeout(function() { - torbutton_log(3, "Removing resize listener.."); - window.removeEventListener("resize", - calling_function, false); - }, 1000); - }, false); + if (m_tb_prefs. + getIntPref("extensions.torbutton.maximize_warning_counter") < 3) { + + // Rate-limit showing our notification if needed. + if (m_tb_resize_date === null) { + m_tb_resize_date = Date.now(); + } else { + // We at least another second before we show a new notification. + // Should be enough to rule out OSes that call our handler rapidly + // due to internal workings. + if (Date.now() - m_tb_resize_date < 1000) { + return; + } + // Resizing but we need to reset |m_tb_resize_date| now. + m_tb_resize_date = Date.now(); + } + + let sb = torbutton_get_stringbundle(); + // No need to get "OK" translated again. + let sbSvc = Cc["@mozilla.org/intl/stringbundle;1"]. + getService(Ci.nsIStringBundleService); + let bundle = sbSvc. + createBundle("chrome://global/locale/commonDialogs.properties"); + let button_label = bundle.GetStringFromName("OK"); + let box = gBrowser.getNotificationBox(); + + let buttons = [{ + label: button_label, + accessKey: 'O', + popup: null, + callback: + function() { + m_tb_prefs.setIntPref("extensions.torbutton.maximize_warning_counter", + m_tb_prefs.getIntPref("extensions.torbutton.maximize_warning_counter") + 1); + } + }]; + + let priority = box.PRIORITY_WARNING_LOW; + let message = + torbutton_get_property_string("torbutton.maximize_warning"); + + box.appendNotification(message, 'new-menu-notification', null, + priority, buttons); + + return; + } + // This is for some weird OS-specific behavior on start-up where, + // depending on the available screen size, the OS thinks it has to + // maximize the window. We don't want to do that AND don't want to + // show the user our notification in this case. + if (m_tb_prefs. + getBoolPref("extensions.torbutton.startup_resize_period")) { + window.addEventListener("resize", + function() { + win.resizeBy(width - win.innerWidth, height - win.innerHeight); + var calling_function = arguments.callee; + setTimeout(function() { + torbutton_log(3, "Removing resize listener.."); + window.removeEventListener("resize", + calling_function, false); + }, 1000); + }, false); + } } }; // We need to handle OSes that auto-maximize windows depending on user - // settings and/or screen resolution. We add a listener which is - // triggerred as soon as the window gets maximized (windowState = 1). + // settings and/or screen resolution in the start-up phase and users that + // try to shoot themselves in the foot by maximizing the window manually. + // We add a listener which is triggerred as soon as the window gets + // maximized (windowState = 1). We are resizing during start-up but not + // later as the user should see only a warning there as a stopgap before + // #14229 lands. // Alas, the Firefox window code is handling the event not itself: // "// Note the current implementation of SetSizeMode just stores // // the new state; it doesn't actually resize. So here we store // // the state and pass the event on to the OS." - // (See: https://mxr.mozilla.org/mozilla-esr24/source/xpfe/appshell/src/ - // nsWebShellWindow.cpp#353) + // (See: https://mxr.mozilla.org/mozilla-esr31/source/xpfe/appshell/src/ + // nsWebShellWindow.cpp#348) // This means we have to cope with race conditions and resizing in the // sizemodechange listener is likely to fail. Thus, we add a specific // resize listener that is doing the work for us. It seems (at least on @@ -3441,14 +3507,9 @@ var torbutton_resizelistener = // the window triggers more than one resize event the first being not the // one we need. Thus we can't remove the listener after the first resize // event got fired. Thus, we have the rather klunky setTimeout() call. - window.addEventListener("sizemodechange", handler, false); - - // We like to remove the sizemodechange listener for everybody again in - // order to allow resizing the window after the start-up - setTimeout(function() { - torbutton_log(3, "Removing sizemodechange listener.."); - window.removeEventListener("sizemodechange", handler, false); - }, 1000); + m_tb_prefs.setBoolPref("extensions.torbutton.startup_resize_period", + true); + window.addEventListener("sizemodechange", m_tb_resize_handler, false); // This is fun. any attempt to directly set the inner window actually // resizes the outer width to that value instead. Must use resizeBy() diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index 8fc4600..a3be7e0 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -58,6 +58,8 @@ torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. Al torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Open security settings +torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine information about your monitor size, which can be used to track you. We recommend you leave Tor Browser windows in their original default size. + # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? canvas.notNow=Not Now diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index a8ed3e1..c85c7f4 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -115,6 +115,12 @@ pref("extensions.torbutton.warned_ff3",false); pref("extensions.torbutton.inserted_button",false); pref("extensions.torbutton.prompted_language",false); +// TODO: This is just part of a stopgap until #14429 gets properly implemented. +// See #7255 for details. We display the warning three times to make sure the +// user did not click on it by accident. +pref("extensions.torbutton.maximize_warning_counter", 0); +pref("extensions.torbutton.startup_resize_period", true); + // Security prefs: pref("extensions.torbutton.no_tor_plugins",true); pref("extensions.torbutton.clear_cookies",false);

1 0

[torbutton/master] Get ftp working in domain isolator
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit 0116a2ac9597a20a0e9bb8910e8a1f5e477d4c32 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Mar 25 09:14:29 2015 -0700 Get ftp working in domain isolator --- src/components/domain-isolator.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index a05fee2..93c7f65 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -97,7 +97,7 @@ tor.newCircuitForDomain = function(domain) { tor.isolateCircuitsByDomain = function () { mozilla.registerProxyChannelFilter(function (aChannel, aProxy) { try { - let channel = aChannel.QueryInterface(Ci.nsIHttpChannel), + let channel = aChannel.QueryInterface(Ci.nsIChannel), firstPartyURI = mozilla.thirdPartyUtil.getFirstPartyURIFromChannel(channel, true) .QueryInterface(Ci.nsIURI), firstPartyDomain = mozilla.thirdPartyUtil @@ -108,6 +108,7 @@ tor.isolateCircuitsByDomain = function () { replacementProxy.username + ":" + replacementProxy.password); return replacementProxy; } catch (err) { + logger.eclog(3, err.message); if (Date.now() - tor.unknownDirtySince > 1000*10*60) { logger.eclog(3, "tor catchall circuit has been dirty for over 10 minutes. Rotating."); tor.newCircuitForDomain("--unknown--");

1 0

[torbutton/master] Bug 7255: Shorten and improve grammar of maximize message.
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit aa74b99ee309108cbc82e53ff4ec5004cde91a9b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Mar 25 10:51:45 2015 -0700 Bug 7255: Shorten and improve grammar of maximize message. --- src/chrome/locale/en/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index a3be7e0..ef1723e 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -58,7 +58,7 @@ torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. Al torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Open security settings -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine information about your monitor size, which can be used to track you. We recommend you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?

1 0

[torbutton/master] Merge remote-tracking branch 'gk/bug_7255_v2' into 1.9-next
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit 9a1a82e2ee6f7536bbc8fe91333e52157f61d219 Merge: ab5010d 52ab447 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Mar 25 10:24:50 2015 -0700 Merge remote-tracking branch 'gk/bug_7255_v2' into 1.9-next src/chrome/content/torbutton.js | 109 ++++++++++++++++++++++------- src/chrome/locale/en/torbutton.properties | 2 + src/defaults/preferences/preferences.js | 6 ++ 3 files changed, 93 insertions(+), 24 deletions(-)

1 0

[torbutton/master] Merge remote-tracking branch 'arthur/ftp-isolation' into 1.9-next
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit ab5010d412d0ca0758122d3529ad3095954cdff4 Merge: dbe9a0d 0116a2a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Mar 25 10:24:37 2015 -0700 Merge remote-tracking branch 'arthur/ftp-isolation' into 1.9-next src/components/domain-isolator.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[torbutton/master] Bug 7255: Make maximize counter count down to 0.
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit 7d130aafe1f7c25e737173282b57511b8e8eba08 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Mar 25 10:52:24 2015 -0700 Bug 7255: Make maximize counter count down to 0. --- src/chrome/content/torbutton.js | 6 +++--- src/defaults/preferences/preferences.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 77a388e..3158c04 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -3421,7 +3421,7 @@ var torbutton_resizelistener = m_tb_resize_handler = function() { if (window.windowState === 1) { if (m_tb_prefs. - getIntPref("extensions.torbutton.maximize_warning_counter") < 3) { + getIntPref("extensions.torbutton.maximize_warnings_remaining") > 0) { // Rate-limit showing our notification if needed. if (m_tb_resize_date === null) { @@ -3452,8 +3452,8 @@ var torbutton_resizelistener = popup: null, callback: function() { - m_tb_prefs.setIntPref("extensions.torbutton.maximize_warning_counter", - m_tb_prefs.getIntPref("extensions.torbutton.maximize_warning_counter") + 1); + m_tb_prefs.setIntPref("extensions.torbutton.maximize_warnings_remaining", + m_tb_prefs.getIntPref("extensions.torbutton.maximize_warnings_remaining") - 1); } }]; diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index c85c7f4..2c109ee 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -118,7 +118,7 @@ pref("extensions.torbutton.prompted_language",false); // TODO: This is just part of a stopgap until #14429 gets properly implemented. // See #7255 for details. We display the warning three times to make sure the // user did not click on it by accident. -pref("extensions.torbutton.maximize_warning_counter", 0); +pref("extensions.torbutton.maximize_warnings_remaining", 3); pref("extensions.torbutton.startup_resize_period", true); // Security prefs:

1 0

[torbutton/master] Bug 13019: Always explicitly set JS english pref.
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit dbe9a0d1a60bae8d445a24eca5faf6f7f319ffd0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Mar 25 10:04:35 2015 -0700 Bug 13019: Always explicitly set JS english pref. --- src/chrome/content/torbutton.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 7ef610a..954af85 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2162,8 +2162,7 @@ function torbutton_update_fingerprinting_prefs() { m_tb_prefs.clearUserPref("intl.charsetmenu.browser.cache"); if(m_tb_prefs.prefHasUserValue("intl.accept_charsets")) m_tb_prefs.clearUserPref("intl.accept_charsets"); - if(m_tb_prefs.prefHasUserValue("javascript.use_us_english_locale")) - m_tb_prefs.clearUserPref("javascript.use_us_english_locale"); + m_tb_prefs.setBoolPref("javascript.use_us_english_locale", false); } } else { m_tb_prefs.setIntPref("browser.display.max_font_attempts",-1);

1 0

[torbutton/master] Bug 13019: Change locale hiding pref to boolean
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit dcbd97834f991c6b4ef5f86154e6823251511075 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Mar 24 21:35:12 2015 -0700 Bug 13019: Change locale hiding pref to boolean --- src/chrome/content/torbutton.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 69efb5f..612a533 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2154,7 +2154,7 @@ function torbutton_update_fingerprinting_prefs() { m_tb_prefs.setCharPref("intl.accept_languages", "en-us, en"); m_tb_prefs.setCharPref("intl.accept_charsets", "iso-8859-1,*,utf-8"); m_tb_prefs.setCharPref("intl.charsetmenu.browser.cache", "UTF-8"); - m_tb_prefs.setCharPref("javascript.default_locale", "en-US"); + m_tb_prefs.setBoolPref("javascript.use_us_english_locale", true); } else { if(m_tb_prefs.prefHasUserValue("intl.accept_languages")) m_tb_prefs.clearUserPref("intl.accept_languages"); @@ -2162,8 +2162,8 @@ function torbutton_update_fingerprinting_prefs() { m_tb_prefs.clearUserPref("intl.charsetmenu.browser.cache"); if(m_tb_prefs.prefHasUserValue("intl.accept_charsets")) m_tb_prefs.clearUserPref("intl.accept_charsets"); - if(m_tb_prefs.prefHasUserValue("javascript.default_locale")) - m_tb_prefs.clearUserPref("javascript.default_locale"); + if(m_tb_prefs.prefHasUserValue("javascript.use_us_english_locale")) + m_tb_prefs.clearUserPref("javascript.use_us_english_locale"); } } else { m_tb_prefs.setIntPref("browser.display.max_font_attempts",-1);

1 0