- tbb-commits - lists.torproject.org

[torbutton/master] Bug 18019: Empty prompt shown after non-en-US update
by gk＠torproject.org 19 Jan '16

19 Jan '16

commit 00a735a2284fe0bf90018b2f93a3ee8c47036ecd Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jan 14 16:41:25 2016 -0500 Bug 18019: Empty prompt shown after non-en-US update Avoid displaying the "request English language web pages?" prompt on non-HTTP pages. Previously, the prompt was displayed when the about:tbupdate page was opened and, on Linux at least, the prompt dialog came up blank. To avoid a similar problem in the case where someone sets their homepage to an HTTP page, we delay showing the prompt for two seconds when the URL of the page that is being loaded matches one of the configured home page URLs. Remove references to the following obsolete Firefox preferences: intl.accept_charsets intl.charsetmenu.browser.cache Remove the following unused default preferences: extensions.torbutton.saved.accept_charsets extensions.torbutton.spoof_charset extensions.torbutton.spoof_language extensions.torbutton.spoof_locale Remove the following unused entity from all dtd files: torbutton.prefs.spoof_english --- src/chrome/content/torbutton.js | 153 ++++++++++++++++++++++++------- src/chrome/locale/af/torbutton.dtd | 1 - src/chrome/locale/ak/torbutton.dtd | 1 - src/chrome/locale/am/torbutton.dtd | 1 - src/chrome/locale/ar/torbutton.dtd | 1 - src/chrome/locale/arn/torbutton.dtd | 1 - src/chrome/locale/ast/torbutton.dtd | 1 - src/chrome/locale/az/torbutton.dtd | 1 - src/chrome/locale/be/torbutton.dtd | 1 - src/chrome/locale/bg/torbutton.dtd | 1 - src/chrome/locale/bms/torbutton.dtd | 1 - src/chrome/locale/bn-IN/torbutton.dtd | 1 - src/chrome/locale/bn/torbutton.dtd | 1 - src/chrome/locale/bo/torbutton.dtd | 1 - src/chrome/locale/br/torbutton.dtd | 1 - src/chrome/locale/bs/torbutton.dtd | 1 - src/chrome/locale/ca/torbutton.dtd | 1 - src/chrome/locale/cs/torbutton.dtd | 1 - src/chrome/locale/csb/torbutton.dtd | 1 - src/chrome/locale/cy/torbutton.dtd | 1 - src/chrome/locale/da/torbutton.dtd | 1 - src/chrome/locale/de/torbutton.dtd | 1 - src/chrome/locale/dz/torbutton.dtd | 1 - src/chrome/locale/el/torbutton.dtd | 1 - src/chrome/locale/en/torbutton.dtd | 1 - src/chrome/locale/eo/torbutton.dtd | 1 - src/chrome/locale/es/torbutton.dtd | 1 - src/chrome/locale/et/torbutton.dtd | 1 - src/chrome/locale/eu/torbutton.dtd | 1 - src/chrome/locale/fa/torbutton.dtd | 1 - src/chrome/locale/fi/torbutton.dtd | 1 - src/chrome/locale/fil/torbutton.dtd | 1 - src/chrome/locale/fo/torbutton.dtd | 1 - src/chrome/locale/fr/torbutton.dtd | 1 - src/chrome/locale/fur/torbutton.dtd | 1 - src/chrome/locale/fy/torbutton.dtd | 1 - src/chrome/locale/ga/torbutton.dtd | 1 - src/chrome/locale/gl/torbutton.dtd | 1 - src/chrome/locale/gu/torbutton.dtd | 1 - src/chrome/locale/gun/torbutton.dtd | 1 - src/chrome/locale/ha/torbutton.dtd | 1 - src/chrome/locale/he/torbutton.dtd | 1 - src/chrome/locale/hi/torbutton.dtd | 1 - src/chrome/locale/hr/torbutton.dtd | 1 - src/chrome/locale/ht/torbutton.dtd | 1 - src/chrome/locale/hu/torbutton.dtd | 1 - src/chrome/locale/hy/torbutton.dtd | 1 - src/chrome/locale/id/torbutton.dtd | 1 - src/chrome/locale/is/torbutton.dtd | 1 - src/chrome/locale/it/torbutton.dtd | 1 - src/chrome/locale/ja/torbutton.dtd | 1 - src/chrome/locale/jv/torbutton.dtd | 1 - src/chrome/locale/ka/torbutton.dtd | 1 - src/chrome/locale/km/torbutton.dtd | 1 - src/chrome/locale/kn/torbutton.dtd | 1 - src/chrome/locale/ko/torbutton.dtd | 1 - src/chrome/locale/ku/torbutton.dtd | 1 - src/chrome/locale/kw/torbutton.dtd | 1 - src/chrome/locale/ky/torbutton.dtd | 1 - src/chrome/locale/lb/torbutton.dtd | 1 - src/chrome/locale/lg/torbutton.dtd | 1 - src/chrome/locale/ln/torbutton.dtd | 1 - src/chrome/locale/lo/torbutton.dtd | 1 - src/chrome/locale/lt/torbutton.dtd | 1 - src/chrome/locale/lv/torbutton.dtd | 1 - src/chrome/locale/mg/torbutton.dtd | 1 - src/chrome/locale/mi/torbutton.dtd | 1 - src/chrome/locale/mk/torbutton.dtd | 1 - src/chrome/locale/ml/torbutton.dtd | 1 - src/chrome/locale/mn/torbutton.dtd | 1 - src/chrome/locale/mr/torbutton.dtd | 1 - src/chrome/locale/ms/torbutton.dtd | 1 - src/chrome/locale/mt/torbutton.dtd | 1 - src/chrome/locale/my/torbutton.dtd | 1 - src/chrome/locale/nah/torbutton.dtd | 1 - src/chrome/locale/nap/torbutton.dtd | 1 - src/chrome/locale/nb/torbutton.dtd | 1 - src/chrome/locale/ne/torbutton.dtd | 1 - src/chrome/locale/nl/torbutton.dtd | 1 - src/chrome/locale/nn/torbutton.dtd | 1 - src/chrome/locale/nso/torbutton.dtd | 1 - src/chrome/locale/oc/torbutton.dtd | 1 - src/chrome/locale/or/torbutton.dtd | 1 - src/chrome/locale/pa/torbutton.dtd | 1 - src/chrome/locale/pap/torbutton.dtd | 1 - src/chrome/locale/pl/torbutton.dtd | 1 - src/chrome/locale/pms/torbutton.dtd | 1 - src/chrome/locale/ps/torbutton.dtd | 1 - src/chrome/locale/pt-BR/torbutton.dtd | 1 - src/chrome/locale/pt/torbutton.dtd | 1 - src/chrome/locale/ro/torbutton.dtd | 1 - src/chrome/locale/ru/torbutton.dtd | 1 - src/chrome/locale/sco/torbutton.dtd | 1 - src/chrome/locale/sk/torbutton.dtd | 1 - src/chrome/locale/sl/torbutton.dtd | 1 - src/chrome/locale/so/torbutton.dtd | 1 - src/chrome/locale/son/torbutton.dtd | 1 - src/chrome/locale/sq/torbutton.dtd | 1 - src/chrome/locale/sr/torbutton.dtd | 1 - src/chrome/locale/st/torbutton.dtd | 1 - src/chrome/locale/su/torbutton.dtd | 1 - src/chrome/locale/sv/torbutton.dtd | 1 - src/chrome/locale/sw/torbutton.dtd | 1 - src/chrome/locale/ta/torbutton.dtd | 1 - src/chrome/locale/te/torbutton.dtd | 1 - src/chrome/locale/tg/torbutton.dtd | 1 - src/chrome/locale/th/torbutton.dtd | 1 - src/chrome/locale/ti/torbutton.dtd | 1 - src/chrome/locale/tk/torbutton.dtd | 1 - src/chrome/locale/tr/torbutton.dtd | 1 - src/chrome/locale/uk/torbutton.dtd | 1 - src/chrome/locale/ur/torbutton.dtd | 1 - src/chrome/locale/ve/torbutton.dtd | 1 - src/chrome/locale/vi/torbutton.dtd | 1 - src/chrome/locale/wa/torbutton.dtd | 1 - src/chrome/locale/wo/torbutton.dtd | 1 - src/chrome/locale/zh-CN/torbutton.dtd | 1 - src/chrome/locale/zh-HK/torbutton.dtd | 1 - src/chrome/locale/zh-TW/torbutton.dtd | 1 - src/chrome/locale/zu/torbutton.dtd | 1 - src/defaults/preferences/preferences.js | 4 - 121 files changed, 122 insertions(+), 154 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 58ab20e..0d1cfe8 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -650,6 +650,13 @@ function torbutton_init() { torbutton_log(3, 'init completed'); } + +function torbutton_should_prompt_for_language_preference() { + return torbutton_get_general_useragent_locale().substring(0, 2) != "en" && + !m_tb_prefs.getBoolPref("extensions.torbutton.prompted_language"); +} + + // Bug 1506 P3: This code asks the user once if they want to spoof their // language to English. // @@ -657,20 +664,21 @@ function torbutton_init() { // the extensions.torbutton.spoof_english preference accordingly. function torbutton_prompt_for_language_preference() { var prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"] - .getService(Components.interfaces.nsIPromptService); + .getService(Ci.nsIPromptService); // Display two buttons, both with string titles. var flags = prompts.STD_YES_NO_BUTTONS; var message = torbutton_get_property_string("torbutton.popup.prompted_language"); - var response = prompts.confirmEx(null, "", message, flags, null, null, null, - null, {value: false}); + m_tb_prefs.setBoolPref("extensions.torbutton.prompted_language", true); + // Display modal prompt, anchored to this window. + var response = prompts.confirmEx(window, "", message, flags, + null, null, null, null, {value: false}); // Update preferences to reflect their response and to prevent the prompt from // being displayed again. m_tb_prefs.setBoolPref("extensions.torbutton.spoof_english", response == 0); - m_tb_prefs.setBoolPref("extensions.torbutton.prompted_language", true); } function torbutton_confirm_plugins() { @@ -2211,16 +2219,10 @@ function torbutton_update_fingerprinting_prefs() { // Governed also by the spoof_english dialog.. if (m_tb_prefs.getBoolPref("extensions.torbutton.spoof_english")) { 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.setBoolPref("javascript.use_us_english_locale", true); } else { if(m_tb_prefs.prefHasUserValue("intl.accept_languages")) m_tb_prefs.clearUserPref("intl.accept_languages"); - if(m_tb_prefs.prefHasUserValue("intl.charsetmenu.browser.cache")) - m_tb_prefs.clearUserPref("intl.charsetmenu.browser.cache"); - if(m_tb_prefs.prefHasUserValue("intl.accept_charsets")) - m_tb_prefs.clearUserPref("intl.accept_charsets"); m_tb_prefs.setBoolPref("javascript.use_us_english_locale", false); } } else { @@ -2229,11 +2231,6 @@ function torbutton_update_fingerprinting_prefs() { if(m_tb_prefs.prefHasUserValue("intl.accept_languages")) m_tb_prefs.clearUserPref("intl.accept_languages"); - if(m_tb_prefs.prefHasUserValue("intl.charsetmenu.browser.cache")) - m_tb_prefs.clearUserPref("intl.charsetmenu.browser.cache"); - if(m_tb_prefs.prefHasUserValue("intl.accept_charsets")) - m_tb_prefs.clearUserPref("intl.accept_charsets"); - } } @@ -2955,8 +2952,6 @@ function torbutton_do_startup() } // Bug 1506 P0: Has some tagging code (can be removed) -// and the language prompt (probably the wrong place for the -// call) function torbutton_new_tab(event) { // listening for new tabs @@ -2972,17 +2967,6 @@ function torbutton_new_tab(event) if (!tor_tag) { // tor is enabled... torbutton_do_async_versioncheck(); } - - // XXX: This is possibly slightly the wrong place to do this check, - // but we know the TabOpen effect is late enough to provide the popup - // after firefox is visible, which makes it more clear whose popup this is. - // - // Ask the user if they want to make "English requests" if their default - // language isn't English and the prompt hasn't been displayed before. - if (torbutton_get_general_useragent_locale().substring(0, 2) != "en" && - !m_tb_prefs.getBoolPref("extensions.torbutton.prompted_language")) { - torbutton_prompt_for_language_preference(); - } } // Bug 1506 P3: Used to decide if we should resize the window. @@ -3127,13 +3111,22 @@ function torbutton_new_window(event) torbutton_do_startup(); + let progress = Cc["@mozilla.org/docloaderservice;1"] + .getService(Ci.nsIWebProgress); + if (m_tb_prefs.getBoolPref("extensions.torbutton.resize_new_windows") && m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled") && torbutton_is_windowed(window)) { - var progress = Cc["@mozilla.org/docloaderservice;1"].getService(Ci. - nsIWebProgress); progress.addProgressListener(torbutton_resizelistener, - Components.interfaces.nsIWebProgress.NOTIFY_STATE_DOCUMENT); + Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT); + } + + // If the default language is not English and we have not already asked, + // add a web progress listener that will show a "request English language + // web pages?" prompt the first time an http or https page is opened. + if (torbutton_should_prompt_for_language_preference()) { + progress.addProgressListener(torbutton_langPromptListener, + Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT); } // Check the version on every new window. We're already pinging check in these cases. @@ -3451,4 +3444,102 @@ var torbutton_resizelistener = onSecurityChange: function() {} }; +var torbutton_langPromptListener = +{ + QueryInterface: function(aIID) + { + if (aIID.equals(Ci.nsIWebProgressListener) || + aIID.equals(Ci.nsISupportsWeakReference) || + aIID.equals(Ci.nsISupports)) + return this; + throw Cr.NS_NOINTERFACE; + }, + + onLocationChange: function(aProgress, aRequest, aURI) {}, + + onStateChange: function(aProgress, aRequest, aFlag, aStatus) { + if (aFlag & Ci.nsIWebProgressListener.STATE_START) { + // If we are loading an HTTP page, show the + // "request English language web pages?" prompt. + try { + let httpChannel = aRequest.QueryInterface(Ci.nsIHttpChannel); + + // The above QI did not throw, so we must have an HTTP request. + // Remove this listener and display the prompt if another window has + // not already done so. + let progress = Cc["@mozilla.org/docloaderservice;1"] + .getService(Ci.nsIWebProgress); + progress.removeProgressListener(torbutton_langPromptListener, + Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT); + + if (torbutton_should_prompt_for_language_preference()) { + if (torbutton_is_homepage_url(aRequest.URI)) { + // If the homepage is being loaded, display the prompt after a + // delay to avoid a problem where a blank prompt is displayed. + // In this case, the homepage will be loaded using the current + // spoof English setting, which is OK. + setTimeout(function() { + if (torbutton_should_prompt_for_language_preference()) + torbutton_prompt_for_language_preference(); + }, 2000); + } else { + // No delay is needed. Display the prompt and fix up the + // Accept-Language header before allowing the load to continue. + torbutton_prompt_for_language_preference(); + + // The Accept-Language header for this request was set when the + // channel was created. Reset it to match the value that will be + // used for future requests. + let val = torbutton_get_current_accept_language_value(aRequest.URI); + if (val) + httpChannel.setRequestHeader("Accept-Language", val, false); + } + } + } catch (e) {} + } + }, + + onProgressChange: function(aProgress, aRequest, curSelfProgress, + maxSelfProgress, curTotalProgress, + maxTotalProgress) {}, + onStatusChange: function(aProgress, aRequest, stat, message) {}, + onSecurityChange: function() {} +}; + + +// aURI should be an http or https nsIURI object. +function torbutton_get_current_accept_language_value(aURI) +{ + try { + let ioService = Cc["@mozilla.org/network/io-service;1"] + .getService(Ci.nsIIOService); + let channel = ioService.newChannelFromURI(aURI); + let httpChannel = channel.QueryInterface(Ci.nsIHttpChannel); + return httpChannel.getRequestHeader("Accept-Language"); + } catch (e) {} + + return null; +} + +function torbutton_is_homepage_url(aURI) +{ + if (!aURI) + return false; + + let homePageURLs; + let choice = m_tb_prefs.getIntPref("browser.startup.page"); + if ((1 == choice) || (3 == choice)) try { + // A homepage may be used at startup. Get the values and check against + // aURI.spec. + homePageURLs = m_tb_prefs.getComplexValue("browser.startup.homepage", + Ci.nsIPrefLocalizedString).data; + } catch (e) {} + + if (!homePageURLs) + return false; + + let urls = homePageURLs.split('|'); + return (urls.indexOf(aURI.spec) >= 0); +} + //vim:set ts=4 diff --git a/src/chrome/locale/af/torbutton.dtd b/src/chrome/locale/af/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/af/torbutton.dtd +++ b/src/chrome/locale/af/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/ak/torbutton.dtd b/src/chrome/locale/ak/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/ak/torbutton.dtd +++ b/src/chrome/locale/ak/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/am/torbutton.dtd b/src/chrome/locale/am/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/am/torbutton.dtd +++ b/src/chrome/locale/am/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index 4908910..ebcbf72 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -74,7 +74,6 @@ <!ENTITY torbutton.prefs.no_shutdown "لا تمسح ملفات تعريف الارتباط (كوكيز) عند إغلاق المتصفح"> <!ENTITY torbutton.prefs.disable_sessionstore "عطّل حفظ الجلسة (محبّذ)"> <!ENTITY torbutton.prefs.headers "الترويسات"> -<!ENTITY torbutton.prefs.spoof_english "انتحل صفة متصفح إنجليزي أمريكي"> <!ENTITY torbutton.prefs.refererspoofing "تزييف المرجع"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "محاكاة ساخرة ذكية للتحويل أثناء عمل تور (سخرية المجال المرجعي المتقاطع)"> diff --git a/src/chrome/locale/arn/torbutton.dtd b/src/chrome/locale/arn/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/arn/torbutton.dtd +++ b/src/chrome/locale/arn/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/ast/torbutton.dtd b/src/chrome/locale/ast/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/ast/torbutton.dtd +++ b/src/chrome/locale/ast/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/az/torbutton.dtd b/src/chrome/locale/az/torbutton.dtd index 2953324..3130db7 100644 --- a/src/chrome/locale/az/torbutton.dtd +++ b/src/chrome/locale/az/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Sönərkən kukiləri silmə"> <!ENTITY torbutton.prefs.disable_sessionstore "Yaddaşa verərkən söndür (məsləhətdir)"> <!ENTITY torbutton.prefs.headers "Başlıqlar"> -<!ENTITY torbutton.prefs.spoof_english "ENG səyyahını dəyiş"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/be/torbutton.dtd b/src/chrome/locale/be/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/be/torbutton.dtd +++ b/src/chrome/locale/be/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/bg/torbutton.dtd b/src/chrome/locale/bg/torbutton.dtd index d0cd061..271f389 100644 --- a/src/chrome/locale/bg/torbutton.dtd +++ b/src/chrome/locale/bg/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/bms/torbutton.dtd b/src/chrome/locale/bms/torbutton.dtd index 0bee3a1..740060d 100644 --- a/src/chrome/locale/bms/torbutton.dtd +++ b/src/chrome/locale/bms/torbutton.dtd @@ -59,7 +59,6 @@ <!ENTITY torbutton.prefs.no_shutdown "ပိတ္သိမ္းလွ်င္ cookies မ်ားကုိ မရွင္းလင္းပါႏွင့္"> <!ENTITY torbutton.prefs.disable_sessionstore "သိမ္းဆည္းေနစဥ္ Session ကုိ ပိတ္ပင္ထားရန္ (အၾကံျပဳေထာက္ခံပါသည္)"> <!ENTITY torbutton.prefs.headers "ေခါင္းစည္းမ်ား"> -<!ENTITY torbutton.prefs.spoof_english "US အဂၤလိပ္ browser ကုိ Spoof လုပ္ရန္"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/bn-IN/torbutton.dtd b/src/chrome/locale/bn-IN/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/bn-IN/torbutton.dtd +++ b/src/chrome/locale/bn-IN/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/bn/torbutton.dtd b/src/chrome/locale/bn/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/bn/torbutton.dtd +++ b/src/chrome/locale/bn/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/bo/torbutton.dtd b/src/chrome/locale/bo/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/bo/torbutton.dtd +++ b/src/chrome/locale/bo/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/br/torbutton.dtd b/src/chrome/locale/br/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/br/torbutton.dtd +++ b/src/chrome/locale/br/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/bs/torbutton.dtd b/src/chrome/locale/bs/torbutton.dtd index cc23948..f5de8f0 100644 --- a/src/chrome/locale/bs/torbutton.dtd +++ b/src/chrome/locale/bs/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/ca/torbutton.dtd b/src/chrome/locale/ca/torbutton.dtd index 38408ec..188aa83 100644 --- a/src/chrome/locale/ca/torbutton.dtd +++ b/src/chrome/locale/ca/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "No esborris les galetes a l'hora de tancar"> <!ENTITY torbutton.prefs.disable_sessionstore "Desactivar guardat de sessió (recommendat)"> <!ENTITY torbutton.prefs.headers "Capçaleres"> -<!ENTITY torbutton.prefs.spoof_english "Simular navegador anglès"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/cs/torbutton.dtd b/src/chrome/locale/cs/torbutton.dtd index f02122e..2a6f104 100644 --- a/src/chrome/locale/cs/torbutton.dtd +++ b/src/chrome/locale/cs/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Hlava"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/csb/torbutton.dtd b/src/chrome/locale/csb/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/csb/torbutton.dtd +++ b/src/chrome/locale/csb/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/cy/torbutton.dtd b/src/chrome/locale/cy/torbutton.dtd index 550acef..b66337f 100644 --- a/src/chrome/locale/cy/torbutton.dtd +++ b/src/chrome/locale/cy/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd index 214f2aa..c2c5169 100644 --- a/src/chrome/locale/da/torbutton.dtd +++ b/src/chrome/locale/da/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Ryd ikke mine cookies ved nedlukning"> <!ENTITY torbutton.prefs.disable_sessionstore "Deaktiver Sessions Lagring (anbefales)"> <!ENTITY torbutton.prefs.headers "Hoveder"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US Engelsk Browser"> <!ENTITY torbutton.prefs.refererspoofing "Forfalskning af henviser"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart forfalskning af henviser under brug af Tor (forfalsk henvisninger som går på tværs af domæner)"> diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index ebfdb3d..99ef7ba 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -74,7 +74,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Cookies beim Beenden des Browsers nicht löschen"> <!ENTITY torbutton.prefs.disable_sessionstore "Speichern des Browserzustandes zwischen Programmaufrufen deaktivieren (empfohlen)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Englischen Browser (US) vortäuschen"> <!ENTITY torbutton.prefs.refererspoofing "Absender tarnen"> <!ENTITY torbutton.prefs.spoofblank "Einen leeren Absender vortäuschen, während Tor benutzt wird (kann einige Seiten ruinieren)"> <!ENTITY torbutton.prefs.smartspoof "Intelligente Absendertarnung während der Benutzung von Tor (Vortäuschung verschiedener Domainabsender)"> diff --git a/src/chrome/locale/dz/torbutton.dtd b/src/chrome/locale/dz/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/dz/torbutton.dtd +++ b/src/chrome/locale/dz/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/el/torbutton.dtd b/src/chrome/locale/el/torbutton.dtd index f0fbbe6..d20db4b 100644 --- a/src/chrome/locale/el/torbutton.dtd +++ b/src/chrome/locale/el/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Να μην γίνει εκκαθάριση cookies κατά το κλείσιμο"> <!ENTITY torbutton.prefs.disable_sessionstore "Απενεργοποίηση αποθήκευσης συνεδρίας (συνιστάται)"> <!ENTITY torbutton.prefs.headers "Κεφαλίδες"> -<!ENTITY torbutton.prefs.spoof_english "Παραπλάνηση της γλώσσας US English του Περιηγητή"> <!ENTITY torbutton.prefs.refererspoofing "Παραπλάνηση διεύθυνσης αναφοράς"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Παραπλάνηση ευφυούς αναφορέα κατά την χρήση του Tor (παραπλανεί "> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 8ff33c5..223302e 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -74,7 +74,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/eo/torbutton.dtd b/src/chrome/locale/eo/torbutton.dtd index 07499c0..472f5b8 100644 --- a/src/chrome/locale/eo/torbutton.dtd +++ b/src/chrome/locale/eo/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd index 94a7219..15c355e 100644 --- a/src/chrome/locale/es/torbutton.dtd +++ b/src/chrome/locale/es/torbutton.dtd @@ -74,7 +74,6 @@ <!ENTITY torbutton.prefs.no_shutdown "No borrar mis cookies al cerrar"> <!ENTITY torbutton.prefs.disable_sessionstore "Deshabilitar el guardado de sesiones (recomendado)"> <!ENTITY torbutton.prefs.headers "Cabeceras"> -<!ENTITY torbutton.prefs.spoof_english "Simular navegador en inglés de EEUU"> <!ENTITY torbutton.prefs.refererspoofing "Simulación del remitente (referer, dirección desde la que accedemos a otra)"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Simular smart referer al usar de Tor (suprime el remitente en cambios de dominio)"> diff --git a/src/chrome/locale/et/torbutton.dtd b/src/chrome/locale/et/torbutton.dtd index 8240b08..dfd7e0c 100644 --- a/src/chrome/locale/et/torbutton.dtd +++ b/src/chrome/locale/et/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd index 066fbc3..43b5a18 100644 --- a/src/chrome/locale/eu/torbutton.dtd +++ b/src/chrome/locale/eu/torbutton.dtd @@ -74,7 +74,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Ez garbitu nire cookieak itzaltzerakoan"> <!ENTITY torbutton.prefs.disable_sessionstore "Ezagitu Saioa Gordetzea (gomendatua)"> <!ENTITY torbutton.prefs.headers "Goiburuak"> -<!ENTITY torbutton.prefs.spoof_english "AEB Ingelera Nabigatzailea balitz ordeztu"> <!ENTITY torbutton.prefs.refererspoofing "Refereraren nortasuna ordeztu"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Adimentsuki ordeztu referera Tor erabiltzen den bitartean (zeharkako domeinu refererak ordezten ditu)"> diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd index d860beb..23864a3 100644 --- a/src/chrome/locale/fa/torbutton.dtd +++ b/src/chrome/locale/fa/torbutton.dtd @@ -74,7 +74,6 @@ <!ENTITY torbutton.prefs.no_shutdown "پاک نکردن کوکی ها هنگام بستن"> <!ENTITY torbutton.prefs.disable_sessionstore "غیرفعال کردن ذخیره‌سازی نشست (Session) ها (توصیه شده)"> <!ENTITY torbutton.prefs.headers "سربرگ‌ها"> -<!ENTITY torbutton.prefs.spoof_english "جعل هویت یک مرورگر با زبان انگليسی آمریکایی"> <!ENTITY torbutton.prefs.refererspoofing "جعل هويت ارجاع دهنده"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "جعل هويت هوشمندانه ارجاع دهنده هنگام استفاده از تُر (ارجاع دهنده های ميان دامنه‌ای را جعل هويت می کند)"> diff --git a/src/chrome/locale/fi/torbutton.dtd b/src/chrome/locale/fi/torbutton.dtd index db531b9..c580ded 100644 --- a/src/chrome/locale/fi/torbutton.dtd +++ b/src/chrome/locale/fi/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Älä poista evästeitä lopettaessa"> <!ENTITY torbutton.prefs.disable_sessionstore "Estä istunnon (Session) tallennus (suositeltavaa)"> <!ENTITY torbutton.prefs.headers "Tunnistetiedot"> -<!ENTITY torbutton.prefs.spoof_english 'Näytä selaimen asetus ulospäin "US English"'> <!ENTITY torbutton.prefs.refererspoofing "Referer-tunnisteen väärentäminen"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Väärennä referer-tunniste älykkäästi, kun Tor on käytössä (lähettää väärennetyn tunnisteen)"> diff --git a/src/chrome/locale/fil/torbutton.dtd b/src/chrome/locale/fil/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/fil/torbutton.dtd +++ b/src/chrome/locale/fil/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/fo/torbutton.dtd b/src/chrome/locale/fo/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/fo/torbutton.dtd +++ b/src/chrome/locale/fo/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index 290505a..c1cf801 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -74,7 +74,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Ne pas supprimer mes cookies à la fermeture"> <!ENTITY torbutton.prefs.disable_sessionstore "Désactiver la fonction de sauvegarde de session (recommandé)"> <!ENTITY torbutton.prefs.headers "Entêtes"> -<!ENTITY torbutton.prefs.spoof_english "Imiter un navigateur anglais US"> <!ENTITY torbutton.prefs.refererspoofing "Altération d'adresse référente"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Altération intelligente de l'adresse référente lorsque Tor est actif (altère les réferences aux domaines externes)"> diff --git a/src/chrome/locale/fur/torbutton.dtd b/src/chrome/locale/fur/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/fur/torbutton.dtd +++ b/src/chrome/locale/fur/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/fy/torbutton.dtd b/src/chrome/locale/fy/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/fy/torbutton.dtd +++ b/src/chrome/locale/fy/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/ga/torbutton.dtd b/src/chrome/locale/ga/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/ga/torbutton.dtd +++ b/src/chrome/locale/ga/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/gl/torbutton.dtd b/src/chrome/locale/gl/torbutton.dtd index e71657a..cf56f33 100644 --- a/src/chrome/locale/gl/torbutton.dtd +++ b/src/chrome/locale/gl/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/gu/torbutton.dtd b/src/chrome/locale/gu/torbutton.dtd index ff1d104..46e01d1 100644 --- a/src/chrome/locale/gu/torbutton.dtd +++ b/src/chrome/locale/gu/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "બંધ કરતી વખતે મારી કૂકીઓ સાફ ન કરો"> <!ENTITY torbutton.prefs.disable_sessionstore "સત્રને સંગ્રહ કરવાનું નિષ્ક્રિય કરો (સૂચવેલ)"> <!ENTITY torbutton.prefs.headers "શીર્ષકો"> -<!ENTITY torbutton.prefs.spoof_english "યુએસ અંગ્રેજી બ્રાઉઝરને છેતરો"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/gun/torbutton.dtd b/src/chrome/locale/gun/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/gun/torbutton.dtd +++ b/src/chrome/locale/gun/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/ha/torbutton.dtd b/src/chrome/locale/ha/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/ha/torbutton.dtd +++ b/src/chrome/locale/ha/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/he/torbutton.dtd b/src/chrome/locale/he/torbutton.dtd index aaf1ff2..12523f3 100644 --- a/src/chrome/locale/he/torbutton.dtd +++ b/src/chrome/locale/he/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "אל תנקה את הקוקיז שלי בזמן סגירת הדפדפן"> <!ENTITY torbutton.prefs.disable_sessionstore "ביטול שמירת מושב (מומלץ)"> <!ENTITY torbutton.prefs.headers "כותרות"> -<!ENTITY torbutton.prefs.spoof_english 'דפדפן אנגלית לזייף ארה"ב'> <!ENTITY torbutton.prefs.refererspoofing "זיוף Referer"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "לזייף referer חכם במהלך שימוש טור (משייכי מזייף צולב דומיין)"> diff --git a/src/chrome/locale/hi/torbutton.dtd b/src/chrome/locale/hi/torbutton.dtd index 081cbba..5dc00ee 100644 --- a/src/chrome/locale/hi/torbutton.dtd +++ b/src/chrome/locale/hi/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/hr/torbutton.dtd b/src/chrome/locale/hr/torbutton.dtd index 83d400d..bd37ad5 100644 --- a/src/chrome/locale/hr/torbutton.dtd +++ b/src/chrome/locale/hr/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/ht/torbutton.dtd b/src/chrome/locale/ht/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/ht/torbutton.dtd +++ b/src/chrome/locale/ht/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/hu/torbutton.dtd b/src/chrome/locale/hu/torbutton.dtd index 557f4a9..6979247 100644 --- a/src/chrome/locale/hu/torbutton.dtd +++ b/src/chrome/locale/hu/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Kilépéskor ne törölje a sütijeimet"> <!ENTITY torbutton.prefs.disable_sessionstore "Munkafolyamat mentésének tiltása (ajánlott)"> <!ENTITY torbutton.prefs.headers "Fejlécek"> -<!ENTITY torbutton.prefs.spoof_english "Amerikai angol böngészőnek álcázás"> <!ENTITY torbutton.prefs.refererspoofing "Hivatkozó oldal hamisítás"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Intelligens hivatkozó oldal hazudás a Tor használat alatt (kereszt domain hivatkozást hazudik)"> diff --git a/src/chrome/locale/hy/torbutton.dtd b/src/chrome/locale/hy/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/hy/torbutton.dtd +++ b/src/chrome/locale/hy/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/id/torbutton.dtd b/src/chrome/locale/id/torbutton.dtd index cf2ecde..7a73427 100644 --- a/src/chrome/locale/id/torbutton.dtd +++ b/src/chrome/locale/id/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Jangan bersihkan cookie saya ketika mematikan browser"> <!ENTITY torbutton.prefs.disable_sessionstore "Nonaktifkan Penyimpanan Sesi (disarankan)"> <!ENTITY torbutton.prefs.headers "Header"> -<!ENTITY torbutton.prefs.spoof_english "Aktifkan penyamar untuk browser US-English"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/is/torbutton.dtd b/src/chrome/locale/is/torbutton.dtd index 6893200..ced330e 100644 --- a/src/chrome/locale/is/torbutton.dtd +++ b/src/chrome/locale/is/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd index c42fb54..c92526f 100644 --- a/src/chrome/locale/it/torbutton.dtd +++ b/src/chrome/locale/it/torbutton.dtd @@ -74,7 +74,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Non cancellare i cookies alla chiusura del browser"> <!ENTITY torbutton.prefs.disable_sessionstore "Disabilita il salvataggio della sessione (consigliato)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Simula di essere un browser US English"> <!ENTITY torbutton.prefs.refererspoofing "Offusca i Referer"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Offusca in modo intelligente i Referef durante l'uso di Tor (offusca i riferimenti da un dominio ad un altro)"> diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index 4582b06..64e91a4 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -74,7 +74,6 @@ <!ENTITY torbutton.prefs.no_shutdown "シャットダウン時に私のcookieを削除しない"> <!ENTITY torbutton.prefs.disable_sessionstore "セッション保存を無効化 (推奨)"> <!ENTITY torbutton.prefs.headers "ヘッダ送信"> -<!ENTITY torbutton.prefs.spoof_english "アメリカ英語のブラウザを詐称する"> <!ENTITY torbutton.prefs.refererspoofing "リファラを偽装する"> <!ENTITY torbutton.prefs.spoofblank "Tor使用中は空白のリファラに偽装する (一部のサイトを壊すかもしれません)"> <!ENTITY torbutton.prefs.smartspoof "Tor使用中はスマートなリファラ偽装 (クロスドメインのリファラを偽装する)"> diff --git a/src/chrome/locale/jv/torbutton.dtd b/src/chrome/locale/jv/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/jv/torbutton.dtd +++ b/src/chrome/locale/jv/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/ka/torbutton.dtd b/src/chrome/locale/ka/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/ka/torbutton.dtd +++ b/src/chrome/locale/ka/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/km/torbutton.dtd b/src/chrome/locale/km/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/km/torbutton.dtd +++ b/src/chrome/locale/km/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/kn/torbutton.dtd b/src/chrome/locale/kn/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/kn/torbutton.dtd +++ b/src/chrome/locale/kn/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd index 708c966..0ce3fce 100644 --- a/src/chrome/locale/ko/torbutton.dtd +++ b/src/chrome/locale/ko/torbutton.dtd @@ -74,7 +74,6 @@ <!ENTITY torbutton.prefs.no_shutdown "종료시 쿠키를 삭제하지 않음"> <!ENTITY torbutton.prefs.disable_sessionstore "세션을 저장하지 않음 (추천)"> <!ENTITY torbutton.prefs.headers "헤더"> -<!ENTITY torbutton.prefs.spoof_english "미국식 영어 브라우저로 조작"> <!ENTITY torbutton.prefs.refererspoofing "리퍼러 스푸핑"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Tor 사용시 스마트 리퍼러 조작 (도메인 리퍼러를 가로질러 조작)"> diff --git a/src/chrome/locale/ku/torbutton.dtd b/src/chrome/locale/ku/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/ku/torbutton.dtd +++ b/src/chrome/locale/ku/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/kw/torbutton.dtd b/src/chrome/locale/kw/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/kw/torbutton.dtd +++ b/src/chrome/locale/kw/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/ky/torbutton.dtd b/src/chrome/locale/ky/torbutton.dtd index 50a94d9..9bd8a41 100644 --- a/src/chrome/locale/ky/torbutton.dtd +++ b/src/chrome/locale/ky/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/lb/torbutton.dtd b/src/chrome/locale/lb/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/lb/torbutton.dtd +++ b/src/chrome/locale/lb/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/lg/torbutton.dtd b/src/chrome/locale/lg/torbutton.dtd index b3b9968..5b05d1d 100644 --- a/src/chrome/locale/lg/torbutton.dtd +++ b/src/chrome/locale/lg/torbutton.dtd @@ -59,7 +59,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/ln/torbutton.dtd b/src/chrome/locale/ln/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/ln/torbutton.dtd +++ b/src/chrome/locale/ln/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/lo/torbutton.dtd b/src/chrome/locale/lo/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/lo/torbutton.dtd +++ b/src/chrome/locale/lo/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/lt/torbutton.dtd b/src/chrome/locale/lt/torbutton.dtd index 10c3b14..001c093 100644 --- a/src/chrome/locale/lt/torbutton.dtd +++ b/src/chrome/locale/lt/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/lv/torbutton.dtd b/src/chrome/locale/lv/torbutton.dtd index aed59e9..d1abb37 100644 --- a/src/chrome/locale/lv/torbutton.dtd +++ b/src/chrome/locale/lv/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Izslēgšanās laikā neizdzēst manas sīkdatnes"> <!ENTITY torbutton.prefs.disable_sessionstore "Atspējot sesijas saglabāšanu (ieteicami)"> <!ENTITY torbutton.prefs.headers "Galvenes"> -<!ENTITY torbutton.prefs.spoof_english "Maldināt, uzdodoties par pārlūku, kurš strādā amerikāņu angļu valodā"> <!ENTITY torbutton.prefs.refererspoofing "Maldināšana, norādot aplamas atsauces"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Vieda maldināšana, Tor'a lietošanas laikā norādot aplamas atsauces (maldina, norādot šķērsdomēnu atsauces)"> diff --git a/src/chrome/locale/mg/torbutton.dtd b/src/chrome/locale/mg/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/mg/torbutton.dtd +++ b/src/chrome/locale/mg/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/mi/torbutton.dtd b/src/chrome/locale/mi/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/mi/torbutton.dtd +++ b/src/chrome/locale/mi/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/mk/torbutton.dtd b/src/chrome/locale/mk/torbutton.dtd index 34895dd..6dc29be 100644 --- a/src/chrome/locale/mk/torbutton.dtd +++ b/src/chrome/locale/mk/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Не ги бриши колачињата при исклучување"> <!ENTITY torbutton.prefs.disable_sessionstore "Не ја зачувувај сесијата (препорачано)"> <!ENTITY torbutton.prefs.headers "Идентификација"> -<!ENTITY torbutton.prefs.spoof_english "Преправај се дека користиш американски браусер"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/ml/torbutton.dtd b/src/chrome/locale/ml/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/ml/torbutton.dtd +++ b/src/chrome/locale/ml/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/mn/torbutton.dtd b/src/chrome/locale/mn/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/mn/torbutton.dtd +++ b/src/chrome/locale/mn/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/mr/torbutton.dtd b/src/chrome/locale/mr/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/mr/torbutton.dtd +++ b/src/chrome/locale/mr/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/ms/torbutton.dtd b/src/chrome/locale/ms/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/ms/torbutton.dtd +++ b/src/chrome/locale/ms/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/mt/torbutton.dtd b/src/chrome/locale/mt/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/mt/torbutton.dtd +++ b/src/chrome/locale/mt/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/my/torbutton.dtd b/src/chrome/locale/my/torbutton.dtd index 1f31c3c..b962348 100644 --- a/src/chrome/locale/my/torbutton.dtd +++ b/src/chrome/locale/my/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "စက်ပိတ်ချိန်တွင် ကျွန်တော့် ကွက်ကီးကို မရှင်းပါနှင့်"> <!ENTITY torbutton.prefs.disable_sessionstore "လုပ်ငန်း သိမ်းဆည်းမှုကို ပိတ်ရန် (အကြံပြုထားသည်)"> <!ENTITY torbutton.prefs.headers "ခေါင်းစည်းများ"> -<!ENTITY torbutton.prefs.spoof_english "ယူအက်စ် အင်္ဂလိပ်သုံး ဘရောင်ဆာကို ပုံမှားရိုက်ရန်"> <!ENTITY torbutton.prefs.refererspoofing "ရည်ညွှန်းသူ ပုံမှားရိုက်ခြင်း"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Tor သုံးစွဲနေချိန်အတွင်း ရည်ညွှန်းချက် ပုံမှားရိုက်ခြင်းကို ပြင်ရန်(ဒိုမိန်း ရည်ညွှန်းချက်များကို ပုံမှားရိုက်ချက်များ)"> diff --git a/src/chrome/locale/nah/torbutton.dtd b/src/chrome/locale/nah/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/nah/torbutton.dtd +++ b/src/chrome/locale/nah/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/nap/torbutton.dtd b/src/chrome/locale/nap/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/nap/torbutton.dtd +++ b/src/chrome/locale/nap/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/nb/torbutton.dtd b/src/chrome/locale/nb/torbutton.dtd index 92ff5d9..54dcc53 100644 --- a/src/chrome/locale/nb/torbutton.dtd +++ b/src/chrome/locale/nb/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Ikke slett informasjonskapslene mine under avslutning"> <!ENTITY torbutton.prefs.disable_sessionstore "Deaktiver lagring av sesjoner (anbefalt)"> <!ENTITY torbutton.prefs.headers "Topptekst"> -<!ENTITY torbutton.prefs.spoof_english "Parodier US Engelsk nettleser"> <!ENTITY torbutton.prefs.refererspoofing "Henviserparodiering"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart henviserparodiering mens du bruker Tor (parodierer henvisninger på tvers av domener)"> diff --git a/src/chrome/locale/ne/torbutton.dtd b/src/chrome/locale/ne/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/ne/torbutton.dtd +++ b/src/chrome/locale/ne/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index e92bb6d..1522697 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -74,7 +74,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Verwijder mijn cookies niet na het afsluiten"> <!ENTITY torbutton.prefs.disable_sessionstore "Schakel sessie opslaan uit (aanbevolen)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Imiteer een US Engelse browser"> <!ENTITY torbutton.prefs.refererspoofing "Verwijzer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Slimme verwijzer spoofing tijdens Tor gebruik (spoofs cross-domain verwijzers)"> diff --git a/src/chrome/locale/nn/torbutton.dtd b/src/chrome/locale/nn/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/nn/torbutton.dtd +++ b/src/chrome/locale/nn/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/nso/torbutton.dtd b/src/chrome/locale/nso/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/nso/torbutton.dtd +++ b/src/chrome/locale/nso/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/oc/torbutton.dtd b/src/chrome/locale/oc/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/oc/torbutton.dtd +++ b/src/chrome/locale/oc/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/or/torbutton.dtd b/src/chrome/locale/or/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/or/torbutton.dtd +++ b/src/chrome/locale/or/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/pa/torbutton.dtd b/src/chrome/locale/pa/torbutton.dtd index 1058026..bda5ba4 100644 --- a/src/chrome/locale/pa/torbutton.dtd +++ b/src/chrome/locale/pa/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/pap/torbutton.dtd b/src/chrome/locale/pap/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/pap/torbutton.dtd +++ b/src/chrome/locale/pap/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd index 7ead4b6..f617b53 100644 --- a/src/chrome/locale/pl/torbutton.dtd +++ b/src/chrome/locale/pl/torbutton.dtd @@ -74,7 +74,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Nie usuwaj ciasteczek przy wyłączaniu"> <!ENTITY torbutton.prefs.disable_sessionstore "Blokuj zapisywanie sesji przeglądarki (zalecane)"> <!ENTITY torbutton.prefs.headers "Nagłówki"> -<!ENTITY torbutton.prefs.spoof_english "Udawaj przeglądarkę z USA"> <!ENTITY torbutton.prefs.refererspoofing "Fałszowanie adresu zwrotnego"> <!ENTITY torbutton.prefs.spoofblank "Wysyłaj pusty adres zwrotny w czasie używania Tora (może zepsuć niektóre strony)"> <!ENTITY torbutton.prefs.smartspoof "Mądrze fałszuj adres zwrotny w czasie używania Tora (fałszuje odnośniki między stronami)"> diff --git a/src/chrome/locale/pms/torbutton.dtd b/src/chrome/locale/pms/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/pms/torbutton.dtd +++ b/src/chrome/locale/pms/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/ps/torbutton.dtd b/src/chrome/locale/ps/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/ps/torbutton.dtd +++ b/src/chrome/locale/ps/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd index 97f4bc0..d03fc5d 100644 --- a/src/chrome/locale/pt-BR/torbutton.dtd +++ b/src/chrome/locale/pt-BR/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Não limpar meus cookies ao encerrar"> <!ENTITY torbutton.prefs.disable_sessionstore "Desabilitar o salvamento de sessão (recomendado)"> <!ENTITY torbutton.prefs.headers "Cabeçalhos"> -<!ENTITY torbutton.prefs.spoof_english "Aparentar um Navegador em Inglês Americano"> <!ENTITY torbutton.prefs.refererspoofing "Falsificar origem"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Falsificar de forma inteligente a origem durante o uso do Tor (falsifica a origem em domínios cruzados)"> diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd index 9b6f323..678ccb7 100644 --- a/src/chrome/locale/pt/torbutton.dtd +++ b/src/chrome/locale/pt/torbutton.dtd @@ -74,7 +74,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Não limpar os meus cookies ao encerrar"> <!ENTITY torbutton.prefs.disable_sessionstore "Desativar Função de Guardar a Sessão (recomendado)"> <!ENTITY torbutton.prefs.headers "Cabeçalhos"> -<!ENTITY torbutton.prefs.spoof_english "Enganar o Navegador em Inglês dos EUA"> <!ENTITY torbutton.prefs.refererspoofing "Enganar remetente"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Falsificação inteligente do referente durante o uso do Tor (falsifica referentes de domínios cruzados)"> diff --git a/src/chrome/locale/ro/torbutton.dtd b/src/chrome/locale/ro/torbutton.dtd index eae1bc6..3e19345 100644 --- a/src/chrome/locale/ro/torbutton.dtd +++ b/src/chrome/locale/ro/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Nu șterge cookie-urile mele la închidere"> <!ENTITY torbutton.prefs.disable_sessionstore "Dezactivați salvarea sesiunilor (recomandat)"> <!ENTITY torbutton.prefs.headers "Antete"> -<!ENTITY torbutton.prefs.spoof_english "Imitează browser-ul în Limba Engleză"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index 2c40381..80e6382 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -74,7 +74,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Не очищать куки-файлы при закрытии браузера"> <!ENTITY torbutton.prefs.disable_sessionstore "Отключить сохранение сессий (желательно)"> <!ENTITY torbutton.prefs.headers "Заголовки"> -<!ENTITY torbutton.prefs.spoof_english "Заголовки как в версии браузера US English"> <!ENTITY torbutton.prefs.refererspoofing "Подстановка заголовка запроса (реферер)"> <!ENTITY torbutton.prefs.spoofblank "Имитировать пустой реферер во время использования Tor (может привести к невозможности просмотра некоторых сайтов)"> <!ENTITY torbutton.prefs.smartspoof "Ловкая подстановка реферера во время использования Tor (подмена перекрёстных доменных рефереров)"> diff --git a/src/chrome/locale/sco/torbutton.dtd b/src/chrome/locale/sco/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/sco/torbutton.dtd +++ b/src/chrome/locale/sco/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/sk/torbutton.dtd b/src/chrome/locale/sk/torbutton.dtd index 867764b..8535f04 100644 --- a/src/chrome/locale/sk/torbutton.dtd +++ b/src/chrome/locale/sk/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/sl/torbutton.dtd b/src/chrome/locale/sl/torbutton.dtd index 81140cd..29ae9cd 100644 --- a/src/chrome/locale/sl/torbutton.dtd +++ b/src/chrome/locale/sl/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Ne zbriši piškotkov pri ugašanju"> <!ENTITY torbutton.prefs.disable_sessionstore "Onemogoči shranjevanje sej (proporočeno)"> <!ENTITY torbutton.prefs.headers "Headers (informacije na začetku paketa - naslavljanje)"> -<!ENTITY torbutton.prefs.spoof_english 'Navidezno "US English" brskalnik'> <!ENTITY torbutton.prefs.refererspoofing "osveži prevaro"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/so/torbutton.dtd b/src/chrome/locale/so/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/so/torbutton.dtd +++ b/src/chrome/locale/so/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/son/torbutton.dtd b/src/chrome/locale/son/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/son/torbutton.dtd +++ b/src/chrome/locale/son/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/sq/torbutton.dtd b/src/chrome/locale/sq/torbutton.dtd index c7ce160..0507557 100644 --- a/src/chrome/locale/sq/torbutton.dtd +++ b/src/chrome/locale/sq/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/sr/torbutton.dtd b/src/chrome/locale/sr/torbutton.dtd index a639874..13d3209 100644 --- a/src/chrome/locale/sr/torbutton.dtd +++ b/src/chrome/locale/sr/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Не чисти моје колачиће при гашењу"> <!ENTITY torbutton.prefs.disable_sessionstore "Онемогући чување сесије (препоручује се)"> <!ENTITY torbutton.prefs.headers "Заглавља"> -<!ENTITY torbutton.prefs.spoof_english "Амерички енглески прегледач"> <!ENTITY torbutton.prefs.refererspoofing "Маскирање упућивача"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Паметно маскирање упућивача када је Tor омогућен (маскира преко домена упућивача)"> diff --git a/src/chrome/locale/st/torbutton.dtd b/src/chrome/locale/st/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/st/torbutton.dtd +++ b/src/chrome/locale/st/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/su/torbutton.dtd b/src/chrome/locale/su/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/su/torbutton.dtd +++ b/src/chrome/locale/su/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index c384b60..cc809ec 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -74,7 +74,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Rensa inte mina kakor vid avstängning"> <!ENTITY torbutton.prefs.disable_sessionstore "Inaktivera Sessionssparande (rekommenderas)"> <!ENTITY torbutton.prefs.headers "Huvuden"> -<!ENTITY torbutton.prefs.spoof_english "Härma US Engelsk Webbläsare"> <!ENTITY torbutton.prefs.refererspoofing "Refererings härmning"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referat härmning under Tor användning (härmar kors domän referat)"> diff --git a/src/chrome/locale/sw/torbutton.dtd b/src/chrome/locale/sw/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/sw/torbutton.dtd +++ b/src/chrome/locale/sw/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/ta/torbutton.dtd b/src/chrome/locale/ta/torbutton.dtd index d4307cb..1393021 100644 --- a/src/chrome/locale/ta/torbutton.dtd +++ b/src/chrome/locale/ta/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/te/torbutton.dtd b/src/chrome/locale/te/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/te/torbutton.dtd +++ b/src/chrome/locale/te/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/tg/torbutton.dtd b/src/chrome/locale/tg/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/tg/torbutton.dtd +++ b/src/chrome/locale/tg/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/th/torbutton.dtd b/src/chrome/locale/th/torbutton.dtd index c2d103c..0a0d7d2 100644 --- a/src/chrome/locale/th/torbutton.dtd +++ b/src/chrome/locale/th/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/ti/torbutton.dtd b/src/chrome/locale/ti/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/ti/torbutton.dtd +++ b/src/chrome/locale/ti/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/tk/torbutton.dtd b/src/chrome/locale/tk/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/tk/torbutton.dtd +++ b/src/chrome/locale/tk/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index 273da1b..62114b5 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -74,7 +74,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Programı kapatığımda çerezlerim silinmesin"> <!ENTITY torbutton.prefs.disable_sessionstore "Oturum Kaydedilmesin (önerilir)"> <!ENTITY torbutton.prefs.headers "Üst Bilgiler"> -<!ENTITY torbutton.prefs.spoof_english "Amerikan İngilizce Web Tarayıcısı Aldatması"> <!ENTITY torbutton.prefs.refererspoofing "Gönderici aldatması"> <!ENTITY torbutton.prefs.spoofblank "Tor kullanılırken boş gönderici aldatması yapılsın (bazı sitelerde çalışmayabilir)"> <!ENTITY torbutton.prefs.smartspoof "Tor kullanılırken akıllı gönderici aldatması yapılsın (siteler arası göndericileri değiştirir)"> diff --git a/src/chrome/locale/uk/torbutton.dtd b/src/chrome/locale/uk/torbutton.dtd index 68bfa9b..e0e7e39 100644 --- a/src/chrome/locale/uk/torbutton.dtd +++ b/src/chrome/locale/uk/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Не чистити куків при вимкненні переглядача"> <!ENTITY torbutton.prefs.disable_sessionstore "Не дозволяти збереження сесій (рекомендовано)"> <!ENTITY torbutton.prefs.headers "Заголовки"> -<!ENTITY torbutton.prefs.spoof_english "Прикидатися переглядачем US English"> <!ENTITY torbutton.prefs.refererspoofing "Підстановка реферер"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Розумна підстановка реферера під час використання Tor (підміна перехресних доменних реферерів)"> diff --git a/src/chrome/locale/ur/torbutton.dtd b/src/chrome/locale/ur/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/ur/torbutton.dtd +++ b/src/chrome/locale/ur/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/ve/torbutton.dtd b/src/chrome/locale/ve/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/ve/torbutton.dtd +++ b/src/chrome/locale/ve/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd index c99f72c..48d6ace 100644 --- a/src/chrome/locale/vi/torbutton.dtd +++ b/src/chrome/locale/vi/torbutton.dtd @@ -74,7 +74,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Không xóa cookie của tôi khi tắt trình duyệt"> <!ENTITY torbutton.prefs.disable_sessionstore "Vô hiệu hóa Lưu Phiên Duyệt Web (khuyến cáo)"> <!ENTITY torbutton.prefs.headers "Đầu đề"> -<!ENTITY torbutton.prefs.spoof_english "Bắt chước Trình duyệt Tiếng Anh-Mỹ"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/wa/torbutton.dtd b/src/chrome/locale/wa/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/wa/torbutton.dtd +++ b/src/chrome/locale/wa/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/wo/torbutton.dtd b/src/chrome/locale/wo/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/wo/torbutton.dtd +++ b/src/chrome/locale/wo/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index 757c4da..235e817 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -74,7 +74,6 @@ <!ENTITY torbutton.prefs.no_shutdown "关闭时不清除 cookies"> <!ENTITY torbutton.prefs.disable_sessionstore "禁用 Firefox 的会话保存（推荐）"> <!ENTITY torbutton.prefs.headers "Header"> -<!ENTITY torbutton.prefs.spoof_english "伪装浏览器语言为美国英语"> <!ENTITY torbutton.prefs.refererspoofing "伪造 Referer"> <!ENTITY torbutton.prefs.spoofblank "使用 Tor 时伪造空白 Referer（可能造成某些网站显示异常）"> <!ENTITY torbutton.prefs.smartspoof "使用 Tor 时伪造智能 Referer（伪造跨域 Referer）"> diff --git a/src/chrome/locale/zh-HK/torbutton.dtd b/src/chrome/locale/zh-HK/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/zh-HK/torbutton.dtd +++ b/src/chrome/locale/zh-HK/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/zh-TW/torbutton.dtd b/src/chrome/locale/zh-TW/torbutton.dtd index 2df0e4d..726e1c7 100644 --- a/src/chrome/locale/zh-TW/torbutton.dtd +++ b/src/chrome/locale/zh-TW/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/chrome/locale/zu/torbutton.dtd b/src/chrome/locale/zu/torbutton.dtd index d59c0c2..ca3741f 100644 --- a/src/chrome/locale/zu/torbutton.dtd +++ b/src/chrome/locale/zu/torbutton.dtd @@ -72,7 +72,6 @@ <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> <!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> <!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index cae5fbd..46bfc0e 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -89,7 +89,6 @@ pref("extensions.torbutton.saved.search_update", true); pref("extensions.torbutton.saved.geo_enabled", true); pref("extensions.torbutton.saved.zoom_specific", true); pref("extensions.torbutton.saved.accept_languages", ""); -pref("extensions.torbutton.saved.accept_charsets", ""); pref("extensions.torbutton.saved.appname_override",""); pref("extensions.torbutton.saved.appversion_override",""); pref("extensions.torbutton.saved.platform_override",""); @@ -140,9 +139,6 @@ pref("extensions.torbutton.notor_sessionstore",true); pref("extensions.torbutton.nonontor_sessionstore",false); pref("extensions.torbutton.reload_crashed_jar",true); pref("extensions.torbutton.spoof_english",true); -pref("extensions.torbutton.spoof_charset",'iso-8859-1,*,utf-8'); -pref("extensions.torbutton.spoof_language",'en-us, en'); -pref("extensions.torbutton.spoof_locale",'en-US'); pref("extensions.torbutton.refererspoof", 0); //0=smart referer, 1=blank, 2=no spoofing pref("extensions.torbutton.shutdown_method",1); // 0=none, 1=tor, 2=all pref("extensions.torbutton.block_tforms",true);

1 0

[tor-browser-bundle/hardened-builds] Update port for ndnop3 obfs4 bridge and add new ndnop5 obfs4 brige.
by gk＠torproject.org 19 Jan '16

19 Jan '16

commit 4a27862b00cc8dce3ed9288dedb938b0fe0e8c05 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 18 13:53:58 2016 -0800 Update port for ndnop3 obfs4 bridge and add new ndnop5 obfs4 brige. ndnop3 is listening on a new port. It will continue listening on its old port too. ndnop5 is a new bridge with a different fingerprint. --- Bundle-Data/PTConfigs/bridge_prefs.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index f4a8448..685c651 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -21,9 +21,10 @@ 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 109.105.109.165:24215 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "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] Update port for ndnop3 obfs4 bridge and add new ndnop5 obfs4 brige.
by gk＠torproject.org 19 Jan '16

19 Jan '16

commit 7699096ba7eacbd5e13bcf9abe2601a42da0b45d Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 18 13:53:58 2016 -0800 Update port for ndnop3 obfs4 bridge and add new ndnop5 obfs4 brige. ndnop3 is listening on a new port. It will continue listening on its old port too. ndnop5 is a new bridge with a different fingerprint. --- Bundle-Data/PTConfigs/bridge_prefs.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index f4a8448..685c651 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -21,9 +21,10 @@ 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 109.105.109.165:24215 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "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/hardened-builds] Bug 18072: Change recommended PT type to obfs4.
by gk＠torproject.org 18 Jan '16

18 Jan '16

commit 87ed0048caa1b5ff260ff061ee7351d20de593d0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jan 16 12:17:19 2016 +0000 Bug 18072: Change recommended PT type to obfs4. --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 11c7471..f4a8448 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -1,5 +1,5 @@ # Tor Launcher preferences (default bridges): -pref("extensions.torlauncher.default_bridge_recommended_type", "obfs3"); +pref("extensions.torlauncher.default_bridge_recommended_type", "obfs4"); // Default bridges. pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:80 A09D536DD1752D542E1FBB3C9CE4449D51298239");

1 0

[tor-browser-bundle/master] Bug 18072: Change recommended PT type to obfs4.
by gk＠torproject.org 18 Jan '16

18 Jan '16

commit 27fe16afe9f45c1052b7b975eae47f0ec723425a Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jan 16 12:17:19 2016 +0000 Bug 18072: Change recommended PT type to obfs4. --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 11c7471..f4a8448 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -1,5 +1,5 @@ # Tor Launcher preferences (default bridges): -pref("extensions.torlauncher.default_bridge_recommended_type", "obfs3"); +pref("extensions.torlauncher.default_bridge_recommended_type", "obfs4"); // Default bridges. pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:80 A09D536DD1752D542E1FBB3C9CE4449D51298239");

1 0

[tor-browser-bundle/hardened-builds] Bug 18071: Add new default obfs4 bridge, riemann.
by gk＠torproject.org 18 Jan '16

18 Jan '16

commit 5625f1787125f23810c72604b367769900299412 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jan 16 12:08:29 2016 +0000 Bug 18071: Add new default obfs4 bridge, riemann. --- Bundle-Data/PTConfigs/bridge_prefs.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index f27d389..11c7471 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -20,9 +20,10 @@ 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 109.105.109.165:24215 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); +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 109.105.109.165:24215 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA 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 18071: Add new default obfs4 bridge, riemann.
by gk＠torproject.org 18 Jan '16

18 Jan '16

commit 27ac6800b3171004f3bd9a9114ff72f1ee991a79 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jan 16 12:08:29 2016 +0000 Bug 18071: Add new default obfs4 bridge, riemann. --- Bundle-Data/PTConfigs/bridge_prefs.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index f27d389..11c7471 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -20,9 +20,10 @@ 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 109.105.109.165:24215 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); +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 109.105.109.165:24215 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA 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/tor-browser-38.5.0esr-5.5-2] fixup! Bug 16940: After update, load local change notes.
by gk＠torproject.org 16 Jan '16

16 Jan '16

commit a46acd14e1bacdc0e3c68a29ee203ce37bd6c9a7 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Jan 15 09:16:15 2016 -0500 fixup! Bug 16940: After update, load local change notes. Fix path separator problem on Windows. This fixes bug 18064. --- browser/base/content/content.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/browser/base/content/content.js b/browser/base/content/content.js index fd87352..d1afdb9 100644 --- a/browser/base/content/content.js +++ b/browser/base/content/content.js @@ -606,7 +606,8 @@ let AboutTBUpdateListener = { let f = Cc["@mozilla.org/file/directory_service;1"] .getService(Ci.nsIProperties).get("DefProfRt", Ci.nsIFile); f = f.parent.parent; // Remove "Data/Browser" - f.appendRelativePath("Docs/ChangeLog.txt"); + f.append("Docs"); + f.append("ChangeLog.txt"); let fs = Cc["@mozilla.org/network/file-input-stream;1"] .createInstance(Ci.nsIFileInputStream);

1 0

[tor-browser-bundle/hardened-builds] Bug 17428: Removing Flashproxy from Tor Browser
by gk＠torproject.org 16 Jan '16

16 Jan '16

commit 4ebec5b9feaae342ed53c70005c6946c96fa0fe1 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 14 15:16:01 2016 +0000 Bug 17428: Removing Flashproxy from Tor Browser Remove M2crypto as well as this was only used by Flashproxy. --- .../PTConfigs/linux/torrc-defaults-appendix | 7 ----- Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 7 ----- .../PTConfigs/windows/torrc-defaults-appendix | 7 ----- .../linux/gitian-pluggable-transports.yml | 21 --------------- .../mac/gitian-pluggable-transports.yml | 27 -------------------- .../windows/gitian-pluggable-transports.yml | 26 ------------------- gitian/fetch-inputs.sh | 10 +++----- gitian/mkbundle-linux.sh | 3 +-- gitian/mkbundle-mac.sh | 3 +-- gitian/mkbundle-windows.sh | 3 +-- gitian/verify-tags.sh | 9 +++---- gitian/versions.alpha | 5 ---- gitian/versions.nightly | 5 ---- 13 files changed, 11 insertions(+), 122 deletions(-) diff --git a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix index d0885ff..c79efde 100644 --- a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -4,12 +4,5 @@ ClientTransportPlugin fte exec ./TorBrowser/Tor/PluggableTransports/fteproxy.bin ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec ./TorBrowser/Tor/PluggableTransports/flashproxy-client --register :0 :9000 - ## meek configuration ClientTransportPlugin meek exec ./TorBrowser/Tor/PluggableTransports/meek-client-torbrowser -- ./TorBrowser/Tor/PluggableTransports/meek-client diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix index 0dee29b..f5eb5e4 100644 --- a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -4,12 +4,5 @@ ClientTransportPlugin fte exec PluggableTransports/fteproxy.bin --managed ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/obfs4proxy -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec PluggableTransports/flashproxy-client --register :0 :9000 - ## meek configuration ClientTransportPlugin meek exec PluggableTransports/meek-client-torbrowser -- PluggableTransports/meek-client diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix index ad1eb07..2c1b636 100644 --- a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -4,12 +4,5 @@ ClientTransportPlugin fte exec TorBrowser\Tor\PluggableTransports\fteproxy --man ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\obfs4proxy -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec TorBrowser\Tor\PluggableTransports\flashproxy-client --register :0 :9000 - ## meek configuration ClientTransportPlugin meek exec TorBrowser\Tor\PluggableTransports\terminateprocess-buffer TorBrowser\Tor\PluggableTransports\meek-client-torbrowser -- TorBrowser\Tor\PluggableTransports\meek-client diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index d9b8338..25b5a1b 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -19,8 +19,6 @@ remotes: "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" "dir": "obfsproxy" -- "url": "https://git.torproject.org/flashproxy.git" - "dir": "flashproxy" - "url": "https://github.com/kpdyer/libfte.git" "dir": "libfte" - "url": "https://github.com/kpdyer/fteproxy.git" @@ -47,7 +45,6 @@ files: - "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" -- "m2crypto.tar.gz" - "parsley.tar.gz" - "go.tar.gz" - "dzip.sh" @@ -164,24 +161,6 @@ script: | cp -a {LICENSE,README} $INSTDIR/Docs/Obfsproxy cd .. - # Building M2Crypto - tar xzf m2crypto.tar.gz - cd M2Crypto-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - $PYTHON setup.py build_ext --build-lib build --openssl $INSTDIR/openssl - $PYTHON setup.py build --build-lib build - cp -a build/M2Crypto $PTDIR/ - cd .. - - # Building flashproxy - cd flashproxy - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make dist DISTNAME=flashproxy-client - cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ - mkdir -p $INSTDIR/Docs/FlashProxy - cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy - cd .. - # Building libfte cd libfte ln -s $INSTDIR/gmp thirdparty/gmp diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index d483462..fd62919 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -18,8 +18,6 @@ remotes: "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" "dir": "obfsproxy" -- "url": "https://git.torproject.org/flashproxy.git" - "dir": "flashproxy" - "url": "https://github.com/kpdyer/libfte.git" "dir": "libfte" - "url": "https://github.com/kpdyer/fteproxy.git" @@ -46,7 +44,6 @@ files: - "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" -- "m2crypto.tar.gz" - "parsley.tar.gz" - "go.tar.gz" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" @@ -188,30 +185,6 @@ script: | sed 's/python2/python/' -i $PTDIR/obfsproxy.bin cd .. - # Building M2Crypto - tar xzf m2crypto.tar.gz - cd M2Crypto-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - # We have to put $INSTDIR/openssl at the beginning of the header and library - # search paths (build_ext otherwise puts it at the end, after CFLAGS and - # LDFLAGS). The reason for this is that /usr/lib/apple/SDKs/MacOSX10.6.sdk/usr - # (part of CFLAGS and LDFLAGS) has its own openssl headers and library files. - # It also has necessary headers like stdio.h, so we can't remove it - # completely, but our locally built openssl must take precedence. - CFLAGS="-I$INSTDIR/openssl/include $CFLAGS" LDFLAGS="-L$INSTDIR/openssl/lib $LDFLAGS" LDSHARED="$LDSHARED -framework Python" python setup.py build_ext --build-lib build --openssl $INSTDIR/openssl -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Python.framework/Headers $SDK_INCLUDES - python setup.py build --build-lib build - cp -a build/M2Crypto $PTDIR/ - cd .. - - # Building flashproxy - cd flashproxy - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make dist DISTNAME=flashproxy-client - cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ - mkdir -p $TBDIR/Docs/FlashProxy - cp -a {doc/*,README,LICENSE,ChangeLog} $TBDIR/Docs/FlashProxy - cd .. - # Building libfte cd libfte find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 1d8caba..9c1642d 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -8,8 +8,6 @@ packages: - "faketime" - "unzip" - "p7zip-full" -# Needed by M2Crypto -- "swig" - "zip" reference_datetime: "2000-01-01 00:00:00" remotes: @@ -17,8 +15,6 @@ remotes: "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" "dir": "obfsproxy" -- "url": "https://git.torproject.org/flashproxy.git" - "dir": "flashproxy" - "url": "https://github.com/kpdyer/libfte.git" "dir": "libfte" - "url": "https://github.com/kpdyer/fteproxy.git" @@ -46,7 +42,6 @@ files: - "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" -- "m2crypto.tar.gz" - "parsley.tar.gz" - "ubuntu-wine.gpg" - "wine-wrappers" @@ -260,27 +255,6 @@ script: | cp {LICENSE,README} $INSTDIR/Docs/Obfsproxy cd .. - # Building M2Crypto - tar xzf m2crypto.tar.gz - cd M2Crypto-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --openssl $INSTDIR/openssl/ -lssl.dll,crypto.dll - LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null - cd .. - # py2exe byte-compiles to .pyc files, which embed the mtime of the parent .py - # file. - find $INSTDIR/python -type f | xargs touch --date="$REFERENCE_DATETIME" - - # Building flashproxy - cd flashproxy - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make dist-exe DISTNAME=flashproxy-client PYTHON="LD_PRELOAD= $INSTPYTHON" - py2exe_zip_timestomp dist/flashproxy-client-win32/py2exe-flashproxy.zip - cp -an dist/flashproxy-client-win32/{*.pyd,*.exe,*.zip} $PTDIR/ - mkdir -p $INSTDIR/Docs/FlashProxy - cp dist/flashproxy-client-win32/{doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy - cd .. - # Building libfte cd libfte ln -s $INSTDIR/gmp thirdparty/gmp diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 9252aea..206023b 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -112,12 +112,12 @@ update_git() { ############################################################################## # Get+verify sigs that exist -for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o \ - "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ + "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -167,7 +167,7 @@ wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -233,7 +233,6 @@ ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz ln -sf "$PYYAML_PACKAGE" pyyaml.tar.gz ln -sf "$ZOPEINTERFACE_PACKAGE" zope.interface.zip ln -sf "$TWISTED_PACKAGE" twisted.tar.bz2 -ln -sf "$M2CRYPTO_PACKAGE" m2crypto.tar.gz ln -sf "$PY2EXE_PACKAGE" py2exe.exe ln -sf "$SETUPTOOLS_PACKAGE" setuptools.tar.gz ln -sf "$GMP_PACKAGE" gmp.tar.bz2 @@ -265,7 +264,6 @@ tor-browser https://git.torproject.org/tor-browser.git $TORBR mingw-w64-git http://git.code.sf.net/p/mingw-w64/mingw-w64 $MINGW_TAG pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git $PYPTLIB_TAG obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git $OBFSPROXY_TAG -flashproxy https://git.torproject.org/flashproxy.git $FLASHPROXY_TAG libfte https://github.com/kpdyer/libfte.git $LIBFTE_TAG fteproxy https://github.com/kpdyer/fteproxy.git $FTEPROXY_TAG libdmg-hfsplus https://github.com/vasi/libdmg-hfsplus.git $LIBDMG_TAG diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 64a0fd4..5fa3966 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -95,7 +95,6 @@ then LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG - FLASHPROXY_TAG=refs/tags/$FLASHPROXY_TAG OBFS4_TAG=refs/tags/$OBFS4_TAG fi @@ -199,7 +198,7 @@ then echo "****** Starting Pluggable Transports Component of Linux Bundle (4/5 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 670d152..39dac5f 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -100,7 +100,6 @@ then LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG - FLASHPROXY_TAG=refs/tags/$FLASHPROXY_TAG OBFS4_TAG=refs/tags/$OBFS4_TAG fi @@ -193,7 +192,7 @@ then echo "****** Starting Pluggable Transports Component of Mac Bundle (4/5 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 6aeec8a..2de0f1e 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -94,7 +94,6 @@ then LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG - FLASHPROXY_TAG=refs/tags/$FLASHPROXY_TAG OBFS4_TAG=refs/tags/$OBFS4_TAG fi @@ -198,7 +197,7 @@ then echo "****** Starting Pluggable Transports Component of Windows Bundle (4/5 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index a1ce6a1..82a810a 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -98,7 +98,6 @@ libevent libevent.gpg $LIBEVENT_TAG tor tor.gpg $TOR_TAG pyptlib pyptlib.gpg $PYPTLIB_TAG obfsproxy obfsproxy.gpg $OBFSPROXY_TAG -flashproxy flashproxy.gpg $FLASHPROXY_TAG goptlib goptlib.gpg $GOPTLIB_TAG meek meek.gpg $MEEK_TAG obfs4 obfs4proxy.gpg $OBFS4_TAG @@ -122,12 +121,12 @@ noto-fonts $NOTOFONTS_TAG EOF # Verify signatures on signed packages -for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o \ - "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ + "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -142,7 +141,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 22eb8df..fd03b8b 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -26,7 +26,6 @@ LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 -FLASHPROXY_TAG=1.6 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 @@ -55,7 +54,6 @@ ARGPARSE_VER=1.2.1 PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 -M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 @@ -81,7 +79,6 @@ ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 -M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz @@ -104,7 +101,6 @@ ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 -M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 @@ -130,7 +126,6 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index a5407a6..d209c6a 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -29,7 +29,6 @@ LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=master OBFSPROXY_TAG=master -FLASHPROXY_TAG=master LIBFTE_TAG=master FTEPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 @@ -58,7 +57,6 @@ ARGPARSE_VER=1.2.1 PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 -M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 @@ -84,7 +82,6 @@ ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 -M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz @@ -107,7 +104,6 @@ ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 -M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 @@ -133,7 +129,6 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE}

1 0

[tor-browser-bundle/master] Bug 17428: Removing Flashproxy from Tor Browser
by gk＠torproject.org 16 Jan '16

16 Jan '16

commit 969136e13861c1cc6d983a66a82736a1fae971c3 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 14 15:16:01 2016 +0000 Bug 17428: Removing Flashproxy from Tor Browser Remove M2crypto as well as this was only used by Flashproxy. --- .../PTConfigs/linux/torrc-defaults-appendix | 7 ----- Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 7 ----- .../PTConfigs/windows/torrc-defaults-appendix | 7 ----- .../linux/gitian-pluggable-transports.yml | 21 --------------- .../mac/gitian-pluggable-transports.yml | 27 -------------------- .../windows/gitian-pluggable-transports.yml | 26 ------------------- gitian/fetch-inputs.sh | 10 +++----- gitian/mkbundle-linux.sh | 3 +-- gitian/mkbundle-mac.sh | 3 +-- gitian/mkbundle-windows.sh | 3 +-- gitian/verify-tags.sh | 9 +++---- gitian/versions.alpha | 5 ---- gitian/versions.nightly | 5 ---- 13 files changed, 11 insertions(+), 122 deletions(-) diff --git a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix index d0885ff..c79efde 100644 --- a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -4,12 +4,5 @@ ClientTransportPlugin fte exec ./TorBrowser/Tor/PluggableTransports/fteproxy.bin ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec ./TorBrowser/Tor/PluggableTransports/flashproxy-client --register :0 :9000 - ## meek configuration ClientTransportPlugin meek exec ./TorBrowser/Tor/PluggableTransports/meek-client-torbrowser -- ./TorBrowser/Tor/PluggableTransports/meek-client diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix index 0dee29b..f5eb5e4 100644 --- a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -4,12 +4,5 @@ ClientTransportPlugin fte exec PluggableTransports/fteproxy.bin --managed ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/obfs4proxy -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec PluggableTransports/flashproxy-client --register :0 :9000 - ## meek configuration ClientTransportPlugin meek exec PluggableTransports/meek-client-torbrowser -- PluggableTransports/meek-client diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix index ad1eb07..2c1b636 100644 --- a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -4,12 +4,5 @@ ClientTransportPlugin fte exec TorBrowser\Tor\PluggableTransports\fteproxy --man ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\obfs4proxy -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec TorBrowser\Tor\PluggableTransports\flashproxy-client --register :0 :9000 - ## meek configuration ClientTransportPlugin meek exec TorBrowser\Tor\PluggableTransports\terminateprocess-buffer TorBrowser\Tor\PluggableTransports\meek-client-torbrowser -- TorBrowser\Tor\PluggableTransports\meek-client diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 0f123ff..31deebb 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -20,8 +20,6 @@ remotes: "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" "dir": "obfsproxy" -- "url": "https://git.torproject.org/flashproxy.git" - "dir": "flashproxy" - "url": "https://github.com/kpdyer/libfte.git" "dir": "libfte" - "url": "https://github.com/kpdyer/fteproxy.git" @@ -48,7 +46,6 @@ files: - "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" -- "m2crypto.tar.gz" - "parsley.tar.gz" - "go.tar.gz" - "dzip.sh" @@ -167,24 +164,6 @@ script: | cp -a {LICENSE,README} $INSTDIR/Docs/Obfsproxy cd .. - # Building M2Crypto - tar xzf m2crypto.tar.gz - cd M2Crypto-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - $PYTHON setup.py build_ext --build-lib build --openssl $INSTDIR/openssl - $PYTHON setup.py build --build-lib build - cp -a build/M2Crypto $PTDIR/ - cd .. - - # Building flashproxy - cd flashproxy - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make dist DISTNAME=flashproxy-client - cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ - mkdir -p $INSTDIR/Docs/FlashProxy - cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy - cd .. - # Building libfte cd libfte ln -s $INSTDIR/gmp thirdparty/gmp diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index d483462..fd62919 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -18,8 +18,6 @@ remotes: "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" "dir": "obfsproxy" -- "url": "https://git.torproject.org/flashproxy.git" - "dir": "flashproxy" - "url": "https://github.com/kpdyer/libfte.git" "dir": "libfte" - "url": "https://github.com/kpdyer/fteproxy.git" @@ -46,7 +44,6 @@ files: - "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" -- "m2crypto.tar.gz" - "parsley.tar.gz" - "go.tar.gz" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" @@ -188,30 +185,6 @@ script: | sed 's/python2/python/' -i $PTDIR/obfsproxy.bin cd .. - # Building M2Crypto - tar xzf m2crypto.tar.gz - cd M2Crypto-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - # We have to put $INSTDIR/openssl at the beginning of the header and library - # search paths (build_ext otherwise puts it at the end, after CFLAGS and - # LDFLAGS). The reason for this is that /usr/lib/apple/SDKs/MacOSX10.6.sdk/usr - # (part of CFLAGS and LDFLAGS) has its own openssl headers and library files. - # It also has necessary headers like stdio.h, so we can't remove it - # completely, but our locally built openssl must take precedence. - CFLAGS="-I$INSTDIR/openssl/include $CFLAGS" LDFLAGS="-L$INSTDIR/openssl/lib $LDFLAGS" LDSHARED="$LDSHARED -framework Python" python setup.py build_ext --build-lib build --openssl $INSTDIR/openssl -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Python.framework/Headers $SDK_INCLUDES - python setup.py build --build-lib build - cp -a build/M2Crypto $PTDIR/ - cd .. - - # Building flashproxy - cd flashproxy - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make dist DISTNAME=flashproxy-client - cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ - mkdir -p $TBDIR/Docs/FlashProxy - cp -a {doc/*,README,LICENSE,ChangeLog} $TBDIR/Docs/FlashProxy - cd .. - # Building libfte cd libfte find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 1d8caba..9c1642d 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -8,8 +8,6 @@ packages: - "faketime" - "unzip" - "p7zip-full" -# Needed by M2Crypto -- "swig" - "zip" reference_datetime: "2000-01-01 00:00:00" remotes: @@ -17,8 +15,6 @@ remotes: "dir": "pyptlib" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" "dir": "obfsproxy" -- "url": "https://git.torproject.org/flashproxy.git" - "dir": "flashproxy" - "url": "https://github.com/kpdyer/libfte.git" "dir": "libfte" - "url": "https://github.com/kpdyer/fteproxy.git" @@ -46,7 +42,6 @@ files: - "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" -- "m2crypto.tar.gz" - "parsley.tar.gz" - "ubuntu-wine.gpg" - "wine-wrappers" @@ -260,27 +255,6 @@ script: | cp {LICENSE,README} $INSTDIR/Docs/Obfsproxy cd .. - # Building M2Crypto - tar xzf m2crypto.tar.gz - cd M2Crypto-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --openssl $INSTDIR/openssl/ -lssl.dll,crypto.dll - LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null - cd .. - # py2exe byte-compiles to .pyc files, which embed the mtime of the parent .py - # file. - find $INSTDIR/python -type f | xargs touch --date="$REFERENCE_DATETIME" - - # Building flashproxy - cd flashproxy - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make dist-exe DISTNAME=flashproxy-client PYTHON="LD_PRELOAD= $INSTPYTHON" - py2exe_zip_timestomp dist/flashproxy-client-win32/py2exe-flashproxy.zip - cp -an dist/flashproxy-client-win32/{*.pyd,*.exe,*.zip} $PTDIR/ - mkdir -p $INSTDIR/Docs/FlashProxy - cp dist/flashproxy-client-win32/{doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy - cd .. - # Building libfte cd libfte ln -s $INSTDIR/gmp thirdparty/gmp diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 9252aea..206023b 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -112,12 +112,12 @@ update_git() { ############################################################################## # Get+verify sigs that exist -for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o \ - "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ + "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -167,7 +167,7 @@ wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -233,7 +233,6 @@ ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz ln -sf "$PYYAML_PACKAGE" pyyaml.tar.gz ln -sf "$ZOPEINTERFACE_PACKAGE" zope.interface.zip ln -sf "$TWISTED_PACKAGE" twisted.tar.bz2 -ln -sf "$M2CRYPTO_PACKAGE" m2crypto.tar.gz ln -sf "$PY2EXE_PACKAGE" py2exe.exe ln -sf "$SETUPTOOLS_PACKAGE" setuptools.tar.gz ln -sf "$GMP_PACKAGE" gmp.tar.bz2 @@ -265,7 +264,6 @@ tor-browser https://git.torproject.org/tor-browser.git $TORBR mingw-w64-git http://git.code.sf.net/p/mingw-w64/mingw-w64 $MINGW_TAG pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git $PYPTLIB_TAG obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git $OBFSPROXY_TAG -flashproxy https://git.torproject.org/flashproxy.git $FLASHPROXY_TAG libfte https://github.com/kpdyer/libfte.git $LIBFTE_TAG fteproxy https://github.com/kpdyer/fteproxy.git $FTEPROXY_TAG libdmg-hfsplus https://github.com/vasi/libdmg-hfsplus.git $LIBDMG_TAG diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 7e84cb9..0c70732 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -95,7 +95,6 @@ then LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG - FLASHPROXY_TAG=refs/tags/$FLASHPROXY_TAG OBFS4_TAG=refs/tags/$OBFS4_TAG fi @@ -224,7 +223,7 @@ then echo "****** Starting Pluggable Transports Component of Linux Bundle (4/5 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 670d152..39dac5f 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -100,7 +100,6 @@ then LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG - FLASHPROXY_TAG=refs/tags/$FLASHPROXY_TAG OBFS4_TAG=refs/tags/$OBFS4_TAG fi @@ -193,7 +192,7 @@ then echo "****** Starting Pluggable Transports Component of Mac Bundle (4/5 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 6aeec8a..2de0f1e 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -94,7 +94,6 @@ then LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG - FLASHPROXY_TAG=refs/tags/$FLASHPROXY_TAG OBFS4_TAG=refs/tags/$OBFS4_TAG fi @@ -198,7 +197,7 @@ then echo "****** Starting Pluggable Transports Component of Windows Bundle (4/5 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index a1ce6a1..82a810a 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -98,7 +98,6 @@ libevent libevent.gpg $LIBEVENT_TAG tor tor.gpg $TOR_TAG pyptlib pyptlib.gpg $PYPTLIB_TAG obfsproxy obfsproxy.gpg $OBFSPROXY_TAG -flashproxy flashproxy.gpg $FLASHPROXY_TAG goptlib goptlib.gpg $GOPTLIB_TAG meek meek.gpg $MEEK_TAG obfs4 obfs4proxy.gpg $OBFS4_TAG @@ -122,12 +121,12 @@ noto-fonts $NOTOFONTS_TAG EOF # Verify signatures on signed packages -for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o \ - "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ + "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -142,7 +141,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 149b765..95ca078 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -22,7 +22,6 @@ LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 -FLASHPROXY_TAG=1.6 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 @@ -51,7 +50,6 @@ ARGPARSE_VER=1.2.1 PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 -M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 @@ -77,7 +75,6 @@ ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 -M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz @@ -100,7 +97,6 @@ ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 -M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 @@ -126,7 +122,6 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 92967a1..b1c7387 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -29,7 +29,6 @@ LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=master OBFSPROXY_TAG=master -FLASHPROXY_TAG=master LIBFTE_TAG=master FTEPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 @@ -58,7 +57,6 @@ ARGPARSE_VER=1.2.1 PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 -M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 @@ -84,7 +82,6 @@ ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 -M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz @@ -107,7 +104,6 @@ ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 -M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 @@ -133,7 +129,6 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE}

1 0

[tor-browser-bundle/master] Added missing changelogs
by gk＠torproject.org 14 Jan '16

14 Jan '16

commit 6480e726175af3f8a0e6496ee9457f07ad265f7c Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 14 13:03:41 2016 +0000 Added missing changelogs --- Bundle-Data/Docs/ChangeLog.txt | 60 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 2e4059e..dbb01bd 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -20,7 +20,40 @@ Tor Browser 5.0.7 -- January 7 2016 * Bug 17931: Tor Browser crashes in LogMessageToConsole() * Bug 17875: Discourage editing of torrc-defaults -Tor Browser 5.5a5 -- December 15 2015 +Tor Browser 5.5a5-hardened -- December 18 2015 + * All Platforms + * Update Firefox to 38.5.0esr + * Update Tor to 0.2.7.6 + * Update OpenSSL to 1.0.1q + * Update NoScript to 2.7 + * Update Torbutton to 1.9.4.2 + * Bug 16940: After update, load local change notes + * 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 + * Bug 17108: Polish about:tor appearance + * Bug 17568: Clean up tor-control-port.js + * Translation updates + * Update Tor Launcher to 0.2.8.1 + * Bug 17344: Enumerate available language packs for language prompt + * Code clean-up + * Translation updates + * Bug 12516: Compile Tor Browser with -fwrapv + * Bug 9659: Avoid loop due to optimistic data SOCKS code (fix of #3875) + * Bug 15564: Isolate SharedWorkers by first-party domain + * Bug 16940: After update, load local change notes + * Bug 17759: Apply whitelist to local fonts in @font-face (fix of #13313) + * Bug 17747: Add ndnop3 as new default obfs4 bridge + * Bug 17009: Shift and Alt keys leak physical keyboard layout (fix of #15646) + * Bug 17369: Disable RC4 fallback + * Bug 17442: Remove custom updater certificate pinning + * Bug 16863: Avoid confusing error when loop.enabled is false + * Bug 17502: Add a preference for hiding "Open with" on download dialog + * Bug 17446: Prevent canvas extraction by third parties (fixup of #6253) + * Bug 16441: Suppress "Reset Tor Browser" prompt + +Tor Browser 5.5a5 -- December 18 2015 * All Platforms * Update Firefox to 38.5.0esr * Update Tor to 0.2.7.6 @@ -53,6 +86,31 @@ Tor Browser 5.5a5 -- December 15 2015 * OS X * Bug 17661: Whitelist font .Helvetica Neue DeskInterface +Tor Browser 5.0.6 -- December 18 2015 + * All Platforms + * Bug 17877: Tor Browser 5.0.5 is using the wrong Mozilla build tag + +Tor Browser 5.0.5 -- December 15 2015 + * All Platforms + * Update Firefox to 38.5.0esr + * Update Tor to 0.2.7.6 + * Update OpenSSL to 1.0.1q + * Update NoScript to 2.7 + * Update HTTPS Everywhere to 5.1.1 + * Update Torbutton to 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 + * Bug 17207: Hide MIME types and plugins from websites + * Bug 16909+17383: Adapt to HTTPS-Everywhere build changes + * Bug 16863: Avoid confusing error when loop.enabled is false + * Bug 17502: Add a preference for hiding "Open with" on download dialog + * Bug 17446: Prevent canvas extraction by third parties (fixup of #6253) + * Bug 16441: Suppress "Reset Tor Browser" prompt + * Bug 17747: Add ndnop3 as new default obfs4 bridge + Tor Browser 5.5a4 -- November 3 2015 * All Platforms * Update Firefox to 38.4.0esr

1 0

[tor-browser/tor-browser-38.5.0esr-5.5-2] Bug 18017: Bump NSS version to 3.19.2.2
by gk＠torproject.org 13 Jan '16

13 Jan '16

commit 3cd72f27da803a61e29cdb8db98bb545ef77c1af Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 12 15:22:26 2016 +0000 Bug 18017: Bump NSS version to 3.19.2.2 This fixes the SLOTH attack (CVE-2015-7575). --- security/nss/lib/nss/nss.h | 4 ++-- security/nss/lib/softoken/softkver.h | 4 ++-- security/nss/lib/ssl/ssl3con.c | 1 - security/nss/lib/util/nssutil.h | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h index 75e37de..71efa46 100644 --- a/security/nss/lib/nss/nss.h +++ b/security/nss/lib/nss/nss.h @@ -33,11 +33,11 @@ * The format of the version string should be * "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]" */ -#define NSS_VERSION "3.19.2.1" _NSS_ECC_STRING _NSS_CUSTOMIZED +#define NSS_VERSION "3.19.2.2" _NSS_ECC_STRING _NSS_CUSTOMIZED #define NSS_VMAJOR 3 #define NSS_VMINOR 19 #define NSS_VPATCH 2 -#define NSS_VBUILD 1 +#define NSS_VBUILD 2 #define NSS_BETA PR_FALSE #ifndef RC_INVOKED diff --git a/security/nss/lib/softoken/softkver.h b/security/nss/lib/softoken/softkver.h index 75c9833..3ec6d0a 100644 --- a/security/nss/lib/softoken/softkver.h +++ b/security/nss/lib/softoken/softkver.h @@ -25,11 +25,11 @@ * The format of the version string should be * "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]" */ -#define SOFTOKEN_VERSION "3.19.2.1" SOFTOKEN_ECC_STRING +#define SOFTOKEN_VERSION "3.19.2.2" SOFTOKEN_ECC_STRING #define SOFTOKEN_VMAJOR 3 #define SOFTOKEN_VMINOR 19 #define SOFTOKEN_VPATCH 2 -#define SOFTOKEN_VBUILD 1 +#define SOFTOKEN_VBUILD 2 #define SOFTOKEN_BETA PR_FALSE #endif /* _SOFTKVER_H_ */ diff --git a/security/nss/lib/ssl/ssl3con.c b/security/nss/lib/ssl/ssl3con.c index e9f4223..982a378 100644 --- a/security/nss/lib/ssl/ssl3con.c +++ b/security/nss/lib/ssl/ssl3con.c @@ -4350,7 +4350,6 @@ static const struct { int tlsHash; SECOidTag oid; } tlsHashOIDMap[] = { - { tls_hash_md5, SEC_OID_MD5 }, { tls_hash_sha1, SEC_OID_SHA1 }, { tls_hash_sha224, SEC_OID_SHA224 }, { tls_hash_sha256, SEC_OID_SHA256 }, diff --git a/security/nss/lib/util/nssutil.h b/security/nss/lib/util/nssutil.h index 62791e0..fa2afd9 100644 --- a/security/nss/lib/util/nssutil.h +++ b/security/nss/lib/util/nssutil.h @@ -19,11 +19,11 @@ * The format of the version string should be * "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]" */ -#define NSSUTIL_VERSION "3.19.2.1" +#define NSSUTIL_VERSION "3.19.2.2" #define NSSUTIL_VMAJOR 3 #define NSSUTIL_VMINOR 19 #define NSSUTIL_VPATCH 2 -#define NSSUTIL_VBUILD 1 +#define NSSUTIL_VBUILD 2 #define NSSUTIL_BETA PR_FALSE SEC_BEGIN_PROTOS

1 0

[tor-browser-bundle/master] Update nightly build target
by gk＠torproject.org 12 Jan '16

12 Jan '16

commit 538bc1a734c9e55ef25d6376fb0fe88906738da0 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 12 08:52:30 2016 +0000 Update nightly build target --- gitian/versions.nightly | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 9f1c6b4..92967a1 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -14,11 +14,11 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=38.4.0esr +FIREFOX_VERSION=38.5.0esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master @@ -46,7 +46,7 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux -OPENSSL_VER=1.0.1p +OPENSSL_VER=1.0.1q GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 @@ -69,7 +69,7 @@ NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.39-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -94,13 +94,13 @@ NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=bd5ee6803165c0fb60bbecbacacf244f1f90d2aa0d71353af610c29121e9b2f1 +OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=dd904c6a12a8b1f6b1da48d51e4df903d7f9211ba5b3f32d7272f413a3bf548a +NOSCRIPT_HASH=7d67363b10708ef816d786e99d035a16a41eee8c8c1b3c87e4544717b066db71 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[torbutton/master] Bug 18004: Remove Tor fundraising donation banner
by gk＠torproject.org 11 Jan '16

11 Jan '16

commit b079df979ff5d2f2e30324be927edadc3e41aa1f Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Jan 5 08:25:41 2016 -0800 Bug 18004: Remove Tor fundraising donation banner The fundraising campaign is finished. We revert three patches that introduced the donation banner. Revert "Bug 17792: Auto-adjust font size for donation banner l10n" This reverts commit 2faa79edfc674786a062a22a93f95734cdcacf15. Revert "Bug 17770: Fix alignments on donation banner" This reverts commit 63699e3da2731c89d1a4e0fbd5e4ba05ea21ff13. Revert "Bug 17565: Tor fundraising campaign donation banner" This reverts commit 5623a3f4ff415eff980b03998b3eff2caf433906. --- src/chrome/content/aboutTor/aboutTor.xhtml | 136 +------------------- src/chrome/content/aboutTor/donation-banner-cd.jpg | Bin 64622 -> 0 bytes src/chrome/content/aboutTor/donation-banner-lp.jpg | Bin 68990 -> 0 bytes src/chrome/content/aboutTor/donation-banner-rd.jpg | Bin 63095 -> 0 bytes src/chrome/locale/en/aboutTor.dtd | 3 - src/chrome/locale/en/aboutTor.properties | 12 -- src/chrome/skin/aboutTor.css | 94 -------------- 7 files changed, 5 insertions(+), 240 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index d591adc..6fdbe50 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -23,16 +23,10 @@ href="chrome://torbutton/skin/aboutTor.css"/> <script type="text/javascript;version=1.7"> <![CDATA[ -let kPropertiesURL = "chrome://torbutton/locale/aboutTor.properties"; -Components.utils.import("resource://gre/modules/Services.jsm"); -let gStringBundle = Services.strings.createBundle(kPropertiesURL); - function onLoad() { insertPropertyStrings(); - setupDonationBanner(); - document.addEventListener("AboutTorAdjustArrow", function() { adjustToolbarIconArrow(); }, false); @@ -150,6 +144,10 @@ function adjustToolbarIconArrow() function insertPropertyStrings() { try { + let kPropertiesURL = "chrome://torbutton/locale/aboutTor.properties"; + + Components.utils.import("resource://gre/modules/Services.jsm"); + let gStringBundle = Services.strings.createBundle(kPropertiesURL); let s1 = gStringBundle.GetStringFromName("aboutTor.searchDC.privacy.link"); let s2 = gStringBundle.GetStringFromName("aboutTor.searchDC.search.link"); let result = gStringBundle.formatStringFromName("aboutTor.searchDC.privacy", @@ -167,135 +165,11 @@ window.addEventListener("pageshow", function() { document.dispatchEvent(evt); }); -// Donation banner constants -let gBannerAlternates = ["lp", "cd", "rd"], - gBannerSuffixes = ["quote", "who", "speciality"]; - -// Change the font size of text in element by ratio. -let scaleFontBy = function (element, ratio) { - let style = window.getComputedStyle(element), - originalFontSize = parseFloat(style.fontSize), - targetFontSize = originalFontSize * ratio; - element.style.fontSize = targetFontSize + "px"; -}; - -// Shrink the font size if the text in the given element is overflowing. -let fitTextInElement = function(element) { - let style = window.getComputedStyle(element); - if (style.whiteSpace === "nowrap") { - // Look for horizontal overflow. - let elementWidth = element.getBoundingClientRect().width, - paddingWidth = parseFloat(style.paddingLeft) + - parseFloat(style.paddingRight), - targetWidth = elementWidth - paddingWidth, - textWidth = element.scrollWidth; - // Compute the appropriate font size to make the text fit. - let ratio = targetWidth / textWidth; - scaleFontBy(element, ratio); - } else { - // Look for vertical overflow. - let elementHeight = element.getBoundingClientRect().height, - paddingHeight = parseFloat(style.paddingTop) + - parseFloat(style.paddingBottom), - targetHeight = elementHeight - paddingHeight; - // Wrapping causes somewhat difficult-to-predict overflow. - // So shrink slightly and repeat. - let ratio = 0; - for (let i = 0; i < 100 && ratio < 1; ++i) { - let textHeight = element.scrollHeight; - ratio = targetHeight < textHeight ? 0.99 : 1; - if (ratio < 1) { - scaleFontBy(element, ratio); - } - } - } -}; - -// Put text of the appropriate locale into donation banner elements. -let populateBannerText = function (suffix, alternate) { - let text = gStringBundle.GetStringFromName("aboutTor.donationBanner." + - alternate + "." + suffix), - div = document.getElementById("donation-banner-" + suffix); - div.innerHTML = text; -}; - -// This function takes care of the donation banner. -function setupDonationBanner() { - try { - // Only show banner for locales for which we have translations. - let browserLocale = Services.prefs.getCharPref("general.useragent.locale"); - if (!["en", "de", "fa", "fr", "nl", "ru", "sv", "tr", "zh"] - .some(code => browserLocale.startsWith(code))) { - return; - } - // Only show banner until 2016 Jan 25. - let now = new Date(); - let expiration = new Date(2016,0,26); - if (now > expiration) { - return; - } - // Only show banner 10 times. - let showCountPref = "extensions.torbutton.donation_banner.shown_count"; - if (Services.prefs.prefHasUserValue(showCountPref)) { - count = Services.prefs.getIntPref(showCountPref); - } else { - count = 0; - } - if (count >= 10) { - return; - } - Services.prefs.setIntPref(showCountPref, count+1); - - // Decide which champion we are using. - let alternate = gBannerAlternates[ - Math.floor(Math.random() * gBannerAlternates.length)]; - // Show the champion. - document.getElementById("donation-banner-image").src = - "chrome://torbutton/content/aboutTor/donation-banner-" + alternate + ".jpg"; - // Populate banner with associated text. - for (let suffix of gBannerSuffixes) { - populateBannerText(suffix, alternate); - } - } catch (e) { - // Something has gone wrong! Don't show the banner, and don't propagate - // any errors that will interfere with other code. - return; - } - // Now we can show the banner. - document.getElementById("donation-banner").style.display = "block"; - for (let id of ["donation-banner-quote", - "donate-button", - "donation-banner-who", - "donation-banner-speciality", - "donation-banner-plea"]) { - fitTextInElement(document.getElementById(id)); - } -} ]]> </script> </head> <body dir="&locale.dir;" onload="onLoad();"> - - <div id="donation-banner" class="top"> - <a href="https://www.torproject.org/donate/donate-tbb"> - <div id="donation-banner-inner"> - <img id="donation-banner-image" width="700" /> - <div id="donation-banner-text"> - <div id="donation-banner-quote"></div> - <div id="donation-banner-credit"> - <div id="donation-banner-who"></div> - <div id="donation-banner-speciality"></div> - </div> - </div> - <div id="donation-banner-plea">&aboutTor.donate.supportTor;</div> - </div> - </a> - <a href="https://www.torproject.org/donate/donate-tbb"> - <div id="donate-button">&aboutTor.donate.donate;</div> - </a> - </div> - - <div id="torstatus" class="top"> +<div id="torstatus" class="top"> <div id="torstatus-version"/> <div id="torstatus-image"/> <div id="torstatus-on-container" class="hideIfTorOff torstatus-container"> diff --git a/src/chrome/content/aboutTor/donation-banner-cd.jpg b/src/chrome/content/aboutTor/donation-banner-cd.jpg deleted file mode 100644 index 522f950..0000000 Binary files a/src/chrome/content/aboutTor/donation-banner-cd.jpg and /dev/null differ diff --git a/src/chrome/content/aboutTor/donation-banner-lp.jpg b/src/chrome/content/aboutTor/donation-banner-lp.jpg deleted file mode 100644 index e807679..0000000 Binary files a/src/chrome/content/aboutTor/donation-banner-lp.jpg and /dev/null differ diff --git a/src/chrome/content/aboutTor/donation-banner-rd.jpg b/src/chrome/content/aboutTor/donation-banner-rd.jpg deleted file mode 100644 index 94e59c7..0000000 Binary files a/src/chrome/content/aboutTor/donation-banner-rd.jpg and /dev/null differ diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd index 17af371..d44f164 100644 --- a/src/chrome/locale/en/aboutTor.dtd +++ b/src/chrome/locale/en/aboutTor.dtd @@ -47,6 +47,3 @@ <!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> <!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> - -<!ENTITY aboutTor.donate.donate "Donate"> -<!ENTITY aboutTor.donate.supportTor "Please support Tor!"> diff --git a/src/chrome/locale/en/aboutTor.properties b/src/chrome/locale/en/aboutTor.properties index 10f09a1..d607324 100644 --- a/src/chrome/locale/en/aboutTor.properties +++ b/src/chrome/locale/en/aboutTor.properties @@ -19,15 +19,3 @@ aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S" aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ - -aboutTor.donationBanner.lp.who=— Laura Poitras -aboutTor.donationBanner.lp.quote=Edward Snowden would not have been able to contact me without Tor and other free software encryption projects. Tor is an essential tool, and it needs our support. -aboutTor.donationBanner.lp.speciality=Oscar-Winning Documentary Filmmaker, <i>CitizenFour</i> - -aboutTor.donationBanner.cd.who=— Cory Doctorow -aboutTor.donationBanner.cd.quote=Privacy and anonymity matter to all of us. -aboutTor.donationBanner.cd.speciality= Novelist, technology activist, co-editor of Boing Boing - -aboutTor.donationBanner.rd.who=— Roger Dingledine -aboutTor.donationBanner.rd.quote=Please help the strongest privacy tool in the world become more sustainable! -aboutTor.donationBanner.rd.speciality=Founder, Acting Executive Director of the Tor Project diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 549256f..0a196dc 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -302,97 +302,3 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { font-size: 18px; } -#donation-banner { - margin: 0px auto; - position: relative; - width: 700px; - display: none; -} - -#donation-banner > a { - display: block; -} - -#donation-banner-inner { - margin: 0px auto; - position: relative; - text-align: left; - width: 700px; - z-index: -1; - display: block; -} - -#donation-banner-image { - display: block; -} - -#donation-banner-text { - height: 120px; - left: 245px; - position: absolute; - top: 23px; - text-align: start; - width: 420px; -} - -#donation-banner-quote { - color: darkgreen; - font-family: serif; - font-size: 18px; - max-height: 64px; - white-space: normal; -} - -#donation-banner-credit { - color: rgb(17, 17, 17); - padding: 10px; - position: absolute; -} - -#donation-banner-who { - font-size: 19px; - font-style: bold; - width: 420px; -} - -#donation-banner-speciality { - font-size: 13px; - text-transform: uppercase; - width: 420px; -} - -#donation-banner-plea { - background-color: yellow; - font-family: sans-serif; - font-size: 20px; - color: darkgreen; - left: 250px; - line-height: 42px; - height: 42px; - padding: 0px 5px 0px 5px; - position: absolute; - text-align: center; - top: 144px; - width: 200px; -} - -#donate-button { - background-color: green; - border-radius: 5px; - color: white; - font-family: sans-serif; - font-size: 20px; - height: 42px; - left: 490px; - line-height: 42px; - padding: 0px 5px 0px 5px; - position: absolute; - text-align: center; - top: 144px; - vertical-align: middle; - width: 110px; -} - -#donate-button:hover { - filter: brightness(1.2); -}

1 0

[tor-browser-bundle/hardened-builds] Updating hardened nightly build target
by gk＠torproject.org 11 Jan '16

11 Jan '16

commit 31c2f6f0a76f9c6dec3645745002153822470f5e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 11 09:13:43 2016 +0000 Updating hardened nightly build target --- gitian/versions.nightly | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 178ef84..a5407a6 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -14,11 +14,11 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=38.4.0esr +FIREFOX_VERSION=38.5.0esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master @@ -46,7 +46,7 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux -OPENSSL_VER=1.0.1p +OPENSSL_VER=1.0.1q GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 @@ -69,7 +69,7 @@ NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.39-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -94,13 +94,13 @@ NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=bd5ee6803165c0fb60bbecbacacf244f1f90d2aa0d71353af610c29121e9b2f1 +OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=dd904c6a12a8b1f6b1da48d51e4df903d7f9211ba5b3f32d7272f413a3bf548a +NOSCRIPT_HASH=7d67363b10708ef816d786e99d035a16a41eee8c8c1b3c87e4544717b066db71 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Updating Changelog
by gk＠torproject.org 11 Jan '16

11 Jan '16

commit f4cab45044ddf01d14ce2dc99e5f4ba040e5192a Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 11 08:55:41 2016 +0000 Updating Changelog Merging the 5.0.7 and 5.5a6-hardened ones and adding the entry for bug 17870. --- Bundle-Data/Docs/ChangeLog.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 87a3799..2e4059e 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,9 +1,24 @@ +Tor Browser 5.5a6-hardened -- January 7 2016 + * All Platforms + * Update NoScript to 2.9 + * Update HTTPS Everywhere to 5.1.2 + * Bug 17931: Tor Browser crashes in LogMessageToConsole() + * Bug 17875: Discourage editing of torrc-defaults + Tor Browser 5.5a6 -- January 7 2016 * All Platforms * Update NoScript to 2.9 * Update HTTPS Everywhere to 5.1.2 * Bug 17931: Tor Browser crashes in LogMessageToConsole() * Bug 17875: Discourage editing of torrc-defaults + * Bug 17870: Add intermediate certificate for authenticode signing + +Tor Browser 5.0.7 -- January 7 2016 + * All Platforms + * Update NoScript to 2.9 + * Update HTTPS Everywhere to 5.1.2 + * Bug 17931: Tor Browser crashes in LogMessageToConsole() + * Bug 17875: Discourage editing of torrc-defaults Tor Browser 5.5a5 -- December 15 2015 * All Platforms

1 0

[tor-browser-bundle/hardened-builds] Preparations for 5.5a6-hardened
by gk＠torproject.org 06 Jan '16

06 Jan '16

commit bda810b201efda79bef12d759845e0a94aef71d6 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 6 10:55:41 2016 +0000 Preparations for 5.5a6-hardened --- Bundle-Data/Docs/ChangeLog.txt | 7 +++++++ gitian/versions.alpha | 8 ++++---- tools/update-responses/config.yml | 10 +++++----- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 8072453..fd05337 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 5.5a6-hardened -- January 7 2016 + * All Platforms + * Update NoScript to 2.9 + * Update HTTPS Everywhere to 5.1.2 + * Bug 17931: Tor Browser crashes in LogMessageToConsole() + * Bug 17875: Discourage editing of torrc-defaults + Tor Browser 5.5a5-hardened -- December 16 2015 * All Platforms * Update Firefox to 38.5.0esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index a7d03c9..22eb8df 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -15,11 +15,11 @@ FIREFOX_VERSION=38.5.0esr TORBROWSER_UPDATE_CHANNEL=hardened -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build2 TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.8.1 TORBUTTON_TAG=1.9.4.2 -HTTPSE_TAG=5.1.1 +HTTPSE_TAG=5.1.2 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -66,7 +66,7 @@ NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.7-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -97,7 +97,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=ab84fd85addd6c15f2ce1e81c58ac9f09b228f9e56703f4d938447b8a2b752ea +NOSCRIPT_HASH=7d67363b10708ef816d786e99d035a16a41eee8c8c1b3c87e4544717b066db71 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 4244d87..fc3ee99 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,7 +9,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - hardened: 5.5a5-hardened + hardened: 5.5a6-hardened release: 5.0 versions: 5.0: @@ -23,12 +23,12 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 5.5a5-hardened: + 5.5a6-hardened: platformVersion: 38.5.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-55a5-hardened-released - download_url: https://www.torproject.org/dist/torbrowser/5.5a5-hardened + detailsURL: https://blog.torproject.org/blog/tor-browser-55a6-hardened-released + download_url: https://www.torproject.org/dist/torbrowser/5.5a6-hardened incremental_from: - - 5.5a4-hardened + - 5.5a5-hardened migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/master] Preparations for 5.5a6
by gk＠torproject.org 05 Jan '16

05 Jan '16

commit 4ecd949538a9dee8ce070a7d69800eb9ab229860 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 5 21:07:51 2016 +0000 Preparations for 5.5a6 --- Bundle-Data/Docs/ChangeLog.txt | 7 +++++++ gitian/versions.alpha | 8 ++++---- tools/update-responses/config.yml | 10 +++++----- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 4812fc4..87a3799 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 5.5a6 -- January 7 2016 + * All Platforms + * Update NoScript to 2.9 + * Update HTTPS Everywhere to 5.1.2 + * Bug 17931: Tor Browser crashes in LogMessageToConsole() + * Bug 17875: Discourage editing of torrc-defaults + Tor Browser 5.5a5 -- December 15 2015 * All Platforms * Update Firefox to 38.5.0esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d1c9f36..149b765 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -11,11 +11,11 @@ FIREFOX_VERSION=38.5.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build2 TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.4.2 -HTTPSE_TAG=5.1.1 +HTTPSE_TAG=5.1.2 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -62,7 +62,7 @@ NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.7-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -93,7 +93,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=ab84fd85addd6c15f2ce1e81c58ac9f09b228f9e56703f4d938447b8a2b752ea +NOSCRIPT_HASH=7d67363b10708ef816d786e99d035a16a41eee8c8c1b3c87e4544717b066db71 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index ddd5b1e..d61793c 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,7 +9,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 5.5a5 + alpha: 5.5a6 release: 5.0 versions: 5.0: @@ -23,12 +23,12 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 5.5a5: + 5.5a6: platformVersion: 38.5.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-55a5-released - download_url: https://www.torproject.org/dist/torbrowser/5.5a5 + detailsURL: https://blog.torproject.org/blog/tor-browser-55a6-released + download_url: https://www.torproject.org/dist/torbrowser/5.5a6 incremental_from: - - 5.5a4 + - 5.5a5 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser/tor-browser-38.5.0esr-5.5-2] Bug 17931: Use a non-format argument in LogMessageToConsole
by gk＠torproject.org 05 Jan '16

05 Jan '16

commit eb89821a7755d3eaaff675801fe8f075be2a6d01 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Jan 4 09:32:21 2016 -0800 Bug 17931: Use a non-format argument in LogMessageToConsole --- dom/base/nsContentUtils.cpp | 15 ++------------- dom/base/nsContentUtils.h | 4 ++-- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index be130e4..5d3dea7 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -11,7 +11,6 @@ #include <algorithm> #include <math.h> -#include "prprf.h" #include "DecoderTraits.h" #include "harfbuzz/hb.h" #include "imgICache.h" @@ -3392,7 +3391,7 @@ nsContentUtils::ReportToConsoleNonLocalized(const nsAString& aErrorText, } void -nsContentUtils::LogMessageToConsole(const char* aMsg, ...) +nsContentUtils::LogMessageToConsole(const char* aMsg) { if (!sConsoleService) { // only need to bother null-checking here CallGetService(NS_CONSOLESERVICE_CONTRACTID, &sConsoleService); @@ -3400,17 +3399,7 @@ nsContentUtils::LogMessageToConsole(const char* aMsg, ...) return; } } - - va_list args; - va_start(args, aMsg); - char* formatted = PR_vsmprintf(aMsg, args); - va_end(args); - if (!formatted) { - return; - } - - sConsoleService->LogStringMessage(NS_ConvertUTF8toUTF16(formatted).get()); - PR_smprintf_free(formatted); + sConsoleService->LogStringMessage(NS_ConvertUTF8toUTF16(aMsg).get()); } bool diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 699889a..b194ae4 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -825,8 +825,8 @@ public: uint32_t aLineNumber = 0, uint32_t aColumnNumber = 0); - static void LogMessageToConsole(const char* aMsg, ...); - + static void LogMessageToConsole(const char* aMsg); + /** * Get the localized string named |aKey| in properties file |aFile|. */

1 0

[tor-browser/tor-browser-38.5.0esr-5.5-2] Bug 17931: Update GonkGPSGeolocationProvider.cpp to use B2G-style logging
by gk＠torproject.org 05 Jan '16

05 Jan '16

commit 4241f99bdf703516b69b03b89feb8152f290d0f2 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Jan 4 09:46:17 2016 -0800 Bug 17931: Update GonkGPSGeolocationProvider.cpp to use B2G-style logging --- dom/system/gonk/GonkGPSGeolocationProvider.cpp | 32 ++++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dom/system/gonk/GonkGPSGeolocationProvider.cpp b/dom/system/gonk/GonkGPSGeolocationProvider.cpp index e5a63db..3cf657f 100644 --- a/dom/system/gonk/GonkGPSGeolocationProvider.cpp +++ b/dom/system/gonk/GonkGPSGeolocationProvider.cpp @@ -51,6 +51,13 @@ #define FLUSH_AIDE_DATA 0 +#undef LOG +#undef ERR +#undef DBG +#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GonkGPSGeolocationProvider", ## args) +#define ERR(args...) __android_log_print(ANDROID_LOG_ERROR, "GonkGPSGeolocationProvider", ## args) +#define DBG(args...) __android_log_print(ANDROID_LOG_DEBUG, "GonkGPSGeolocationProvider" , ## args) + using namespace mozilla; using namespace mozilla::dom; @@ -145,8 +152,7 @@ void GonkGPSGeolocationProvider::NmeaCallback(GpsUtcTime timestamp, const char* nmea, int length) { if (gDebug_isLoggingEnabled) { - nsContentUtils::LogMessageToConsole("geo: NMEA: timestamp:\t%lld, length: %d, %s", - timestamp, length, nmea); + DBG("NMEA: timestamp:\t%lld, length: %d, %s", timestamp, length, nmea); } } @@ -420,15 +426,13 @@ GonkGPSGeolocationProvider::RequestSettingValue(const char* aKey) nsCOMPtr<nsISettingsServiceLock> lock; nsresult rv = ss->CreateLock(nullptr, getter_AddRefs(lock)); if (NS_FAILED(rv)) { - nsContentUtils::LogMessageToConsole( - "geo: error while createLock setting '%s': %d\n", aKey, rv); + ERR("error while createLock setting '%s': %d\n", aKey, rv); return; } rv = lock->Get(aKey, this); if (NS_FAILED(rv)) { - nsContentUtils::LogMessageToConsole( - "geo: error while get setting '%s': %d\n", aKey, rv); + ERR("error while get setting '%s': %d\n", aKey, rv); return; } } @@ -599,8 +603,7 @@ GonkGPSGeolocationProvider::InjectLocation(double latitude, float accuracy) { if (gDebug_isLoggingEnabled) { - nsContentUtils::LogMessageToConsole("geo: injecting location (%f, %f) accuracy: %f", - latitude, longitude, accuracy); + DBG("injecting location (%f, %f) accuracy: %f", latitude, longitude, accuracy); } MOZ_ASSERT(NS_IsMainThread()); @@ -818,14 +821,12 @@ GonkGPSGeolocationProvider::NetworkLocationUpdate::Update(nsIDOMGeoPosition *pos (isGPSTempInactive && delta > kMinMLSCoordChangeInMeters)) { if (gDebug_isLoggingEnabled) { - nsContentUtils::LogMessageToConsole("geo: Using MLS, GPS age:%fs, MLS Delta:%fm\n", - diff_ms / 1000.0, delta); + DBG("Using MLS, GPS age:%fs, MLS Delta:%fm\n", diff_ms / 1000.0, delta); } provider->mLocationCallback->Update(position); } else if (provider->mLastGPSPosition) { if (gDebug_isLoggingEnabled) { - nsContentUtils::LogMessageToConsole("geo: Using old GPS age:%fs\n", - diff_ms / 1000.0); + DBG("Using old GPS age:%fs\n", diff_ms / 1000.0); } // This is a fallback case so that the GPS provider responds with its last @@ -1058,16 +1059,15 @@ GonkGPSGeolocationProvider::Observe(nsISupports* aSubject, } if (setting.mKey.EqualsASCII(kSettingDebugGpsIgnored)) { - nsContentUtils::LogMessageToConsole("geo: received mozsettings-changed: ignoring\n"); + LOG("received mozsettings-changed: ignoring\n"); gDebug_isGPSLocationIgnored = setting.mValue.isBoolean() ? setting.mValue.toBoolean() : false; if (gDebug_isLoggingEnabled) { - nsContentUtils::LogMessageToConsole("geo: Debug: GPS ignored %d\n", - gDebug_isGPSLocationIgnored); + DBG("GPS ignored %d\n", gDebug_isGPSLocationIgnored); } return NS_OK; } else if (setting.mKey.EqualsASCII(kSettingDebugEnabled)) { - nsContentUtils::LogMessageToConsole("geo: received mozsettings-changed: logging\n"); + LOG("received mozsettings-changed: logging\n"); gDebug_isLoggingEnabled = setting.mValue.isBoolean() ? setting.mValue.toBoolean() : false; return NS_OK;

1 0

[tor-browser/tor-browser-38.5.0esr-5.0-2] Bug 17931: Update GonkGPSGeolocationProvider.cpp to use B2G-style logging
by gk＠torproject.org 05 Jan '16

05 Jan '16

commit 8e50016a5c562efe0b395ea75a889d4d3528fc9b Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Jan 4 09:46:17 2016 -0800 Bug 17931: Update GonkGPSGeolocationProvider.cpp to use B2G-style logging --- dom/system/gonk/GonkGPSGeolocationProvider.cpp | 32 ++++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dom/system/gonk/GonkGPSGeolocationProvider.cpp b/dom/system/gonk/GonkGPSGeolocationProvider.cpp index e5a63db..3cf657f 100644 --- a/dom/system/gonk/GonkGPSGeolocationProvider.cpp +++ b/dom/system/gonk/GonkGPSGeolocationProvider.cpp @@ -51,6 +51,13 @@ #define FLUSH_AIDE_DATA 0 +#undef LOG +#undef ERR +#undef DBG +#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GonkGPSGeolocationProvider", ## args) +#define ERR(args...) __android_log_print(ANDROID_LOG_ERROR, "GonkGPSGeolocationProvider", ## args) +#define DBG(args...) __android_log_print(ANDROID_LOG_DEBUG, "GonkGPSGeolocationProvider" , ## args) + using namespace mozilla; using namespace mozilla::dom; @@ -145,8 +152,7 @@ void GonkGPSGeolocationProvider::NmeaCallback(GpsUtcTime timestamp, const char* nmea, int length) { if (gDebug_isLoggingEnabled) { - nsContentUtils::LogMessageToConsole("geo: NMEA: timestamp:\t%lld, length: %d, %s", - timestamp, length, nmea); + DBG("NMEA: timestamp:\t%lld, length: %d, %s", timestamp, length, nmea); } } @@ -420,15 +426,13 @@ GonkGPSGeolocationProvider::RequestSettingValue(const char* aKey) nsCOMPtr<nsISettingsServiceLock> lock; nsresult rv = ss->CreateLock(nullptr, getter_AddRefs(lock)); if (NS_FAILED(rv)) { - nsContentUtils::LogMessageToConsole( - "geo: error while createLock setting '%s': %d\n", aKey, rv); + ERR("error while createLock setting '%s': %d\n", aKey, rv); return; } rv = lock->Get(aKey, this); if (NS_FAILED(rv)) { - nsContentUtils::LogMessageToConsole( - "geo: error while get setting '%s': %d\n", aKey, rv); + ERR("error while get setting '%s': %d\n", aKey, rv); return; } } @@ -599,8 +603,7 @@ GonkGPSGeolocationProvider::InjectLocation(double latitude, float accuracy) { if (gDebug_isLoggingEnabled) { - nsContentUtils::LogMessageToConsole("geo: injecting location (%f, %f) accuracy: %f", - latitude, longitude, accuracy); + DBG("injecting location (%f, %f) accuracy: %f", latitude, longitude, accuracy); } MOZ_ASSERT(NS_IsMainThread()); @@ -818,14 +821,12 @@ GonkGPSGeolocationProvider::NetworkLocationUpdate::Update(nsIDOMGeoPosition *pos (isGPSTempInactive && delta > kMinMLSCoordChangeInMeters)) { if (gDebug_isLoggingEnabled) { - nsContentUtils::LogMessageToConsole("geo: Using MLS, GPS age:%fs, MLS Delta:%fm\n", - diff_ms / 1000.0, delta); + DBG("Using MLS, GPS age:%fs, MLS Delta:%fm\n", diff_ms / 1000.0, delta); } provider->mLocationCallback->Update(position); } else if (provider->mLastGPSPosition) { if (gDebug_isLoggingEnabled) { - nsContentUtils::LogMessageToConsole("geo: Using old GPS age:%fs\n", - diff_ms / 1000.0); + DBG("Using old GPS age:%fs\n", diff_ms / 1000.0); } // This is a fallback case so that the GPS provider responds with its last @@ -1058,16 +1059,15 @@ GonkGPSGeolocationProvider::Observe(nsISupports* aSubject, } if (setting.mKey.EqualsASCII(kSettingDebugGpsIgnored)) { - nsContentUtils::LogMessageToConsole("geo: received mozsettings-changed: ignoring\n"); + LOG("received mozsettings-changed: ignoring\n"); gDebug_isGPSLocationIgnored = setting.mValue.isBoolean() ? setting.mValue.toBoolean() : false; if (gDebug_isLoggingEnabled) { - nsContentUtils::LogMessageToConsole("geo: Debug: GPS ignored %d\n", - gDebug_isGPSLocationIgnored); + DBG("GPS ignored %d\n", gDebug_isGPSLocationIgnored); } return NS_OK; } else if (setting.mKey.EqualsASCII(kSettingDebugEnabled)) { - nsContentUtils::LogMessageToConsole("geo: received mozsettings-changed: logging\n"); + LOG("received mozsettings-changed: logging\n"); gDebug_isLoggingEnabled = setting.mValue.isBoolean() ? setting.mValue.toBoolean() : false; return NS_OK;

1 0

[tor-browser/tor-browser-38.5.0esr-5.0-2] Bug 17931: Use a non-format argument in LogMessageToConsole
by gk＠torproject.org 05 Jan '16

05 Jan '16

commit 0a6d7f30284d9e67c32acdb1abbd73da9ced4ca2 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Jan 4 09:32:21 2016 -0800 Bug 17931: Use a non-format argument in LogMessageToConsole --- dom/base/nsContentUtils.cpp | 15 ++------------- dom/base/nsContentUtils.h | 4 ++-- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index be130e4..5d3dea7 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -11,7 +11,6 @@ #include <algorithm> #include <math.h> -#include "prprf.h" #include "DecoderTraits.h" #include "harfbuzz/hb.h" #include "imgICache.h" @@ -3392,7 +3391,7 @@ nsContentUtils::ReportToConsoleNonLocalized(const nsAString& aErrorText, } void -nsContentUtils::LogMessageToConsole(const char* aMsg, ...) +nsContentUtils::LogMessageToConsole(const char* aMsg) { if (!sConsoleService) { // only need to bother null-checking here CallGetService(NS_CONSOLESERVICE_CONTRACTID, &sConsoleService); @@ -3400,17 +3399,7 @@ nsContentUtils::LogMessageToConsole(const char* aMsg, ...) return; } } - - va_list args; - va_start(args, aMsg); - char* formatted = PR_vsmprintf(aMsg, args); - va_end(args); - if (!formatted) { - return; - } - - sConsoleService->LogStringMessage(NS_ConvertUTF8toUTF16(formatted).get()); - PR_smprintf_free(formatted); + sConsoleService->LogStringMessage(NS_ConvertUTF8toUTF16(aMsg).get()); } bool diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 699889a..b194ae4 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -825,8 +825,8 @@ public: uint32_t aLineNumber = 0, uint32_t aColumnNumber = 0); - static void LogMessageToConsole(const char* aMsg, ...); - + static void LogMessageToConsole(const char* aMsg); + /** * Get the localized string named |aKey| in properties file |aFile|. */

1 0

[tor-browser-bundle/maint-5.0] Release preparations for 5.0.7
by gk＠torproject.org 05 Jan '16

05 Jan '16

commit 40b2d143983121f9bfe967effeece534d8cad5d9 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 5 10:06:20 2016 +0000 Release preparations for 5.0.7 --- Bundle-Data/Docs/ChangeLog.txt | 7 +++++++ gitian/versions | 8 ++++---- tools/update-responses/config.yml | 9 ++++----- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index cca1175..40eaa17 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 5.0.7 -- January 7 2016 + * All Platforms + * Update NoScript to 2.9 + * Update HTTPS Everywhere to 5.1.2 + * Bug 17931: Tor Browser crashes in LogMessageToConsole() + * Bug 17875: Discourage editing of torrc-defaults + Tor Browser 5.0.6 -- December 18 2015 * All Platforms * Bug 17877: Tor Browser 5.0.5 is using the wrong Mozilla build tag diff --git a/gitian/versions b/gitian/versions index 1633312..c41a675 100755 --- a/gitian/versions +++ b/gitian/versions @@ -8,11 +8,11 @@ FIREFOX_VERSION=38.5.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-2-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-2-build2 TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.3.7 -HTTPSE_TAG=5.1.1 +HTTPSE_TAG=5.1.2 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -57,7 +57,7 @@ GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.7-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -86,7 +86,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=ab84fd85addd6c15f2ce1e81c58ac9f09b228f9e56703f4d938447b8a2b752ea +NOSCRIPT_HASH=7d67363b10708ef816d786e99d035a16a41eee8c8c1b3c87e4544717b066db71 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 4be39a9..d6a39ac 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -10,15 +10,14 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 5.5a1 - release: 5.0.6 + release: 5.0.7 versions: - 5.0.6: + 5.0.7: platformVersion: 38.5.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/5.0.6 + download_url: https://www.torproject.org/dist/torbrowser/5.0.7 incremental_from: - - 5.0.4 - - 5.0.5 + - 5.0.6 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/hardened-builds] Adding Cooper Quintin's key
by gk＠torproject.org 23 Dec '15

23 Dec '15

commit 00fbe591a12c86e93f73a8a56da4a9157844f5a1 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 23 08:03:04 2015 +0000 Adding Cooper Quintin's key --- gitian/gpg/https-everywhere.gpg | Bin 112546 -> 188424 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/https-everywhere.gpg b/gitian/gpg/https-everywhere.gpg index 96a2f45..43aa4e4 100644 Binary files a/gitian/gpg/https-everywhere.gpg and b/gitian/gpg/https-everywhere.gpg differ

1 0

[tor-browser-bundle/maint-5.0] Adding Cooper Quintin's key
by gk＠torproject.org 23 Dec '15

23 Dec '15

commit 5a518270be8c4a170134d41096927f0cd0fcf3d0 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 23 08:03:04 2015 +0000 Adding Cooper Quintin's key --- gitian/gpg/https-everywhere.gpg | Bin 112546 -> 188424 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/https-everywhere.gpg b/gitian/gpg/https-everywhere.gpg index 96a2f45..43aa4e4 100644 Binary files a/gitian/gpg/https-everywhere.gpg and b/gitian/gpg/https-everywhere.gpg differ

1 0