Commit ef23e342 authored by Mike Perry's avatar Mike Perry
Browse files

Merge remote-tracking branch 'arthur/13019' into bug13019

parents 270eed43 dcbd9783
......@@ -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);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment