- tbb-commits - lists.torproject.org

[torbutton/master] Bug 14392: Make about:tor behave like other initial pages.
by mikeperry＠torproject.org 12 Feb '15

12 Feb '15

commit 4d194b2b827b65f357f6c0a9e02ac719bad86afc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 11 16:46:10 2015 -0800 Bug 14392: Make about:tor behave like other initial pages. In particular: Don't steal focus from the URL bar. --- src/chrome/content/aboutTor/aboutTor.xhtml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index c13f60e..9b77af2 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -33,7 +33,6 @@ function onLoad() window.setTimeout( function() { adjustToolbarIconArrow(); - document.getElementById('sx').focus(); }, 0); }

1 0

[torbutton/master] Bug 14490: Make disconnect search the default search engine.
by mikeperry＠torproject.org 12 Feb '15

12 Feb '15

commit 699f82654904841df2691fe020928933afe312ff Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 11 16:57:08 2015 -0800 Bug 14490: Make disconnect search the default search engine. --- src/chrome/content/aboutTor/aboutTor.xhtml | 8 ++++---- src/chrome/locale/en/aboutTor.dtd | 1 + src/chrome/locale/en/aboutTor.properties | 6 ++++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 9b77af2..95807fd 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -112,9 +112,9 @@ function insertPropertyStrings() Components.utils.import("resource://gre/modules/Services.jsm"); var gStringBundle = Services.strings.createBundle(kPropertiesURL); - var s1 = gStringBundle.GetStringFromName("aboutTor.searchSP.privacy.link"); - var s2 = gStringBundle.GetStringFromName("aboutTor.searchSP.search.link"); - var result = gStringBundle.formatStringFromName("aboutTor.searchSP.privacy", + var s1 = gStringBundle.GetStringFromName("aboutTor.searchDC.privacy.link"); + var s2 = gStringBundle.GetStringFromName("aboutTor.searchDC.search.link"); + var result = gStringBundle.formatStringFromName("aboutTor.searchDC.privacy", [s1, s2], 2); if (result) { var elem = document.getElementById("searchProviderInfo"); @@ -165,7 +165,7 @@ window.addEventListener("pageshow", function() { </div> <div class="searchbox hideIfTorOff">  - <form action="&aboutTor.searchSPPost.link;" method="post"> + <form action="&aboutTor.searchDCPost.link;" method="post"> <div id="sxw"> <div id="sbutton"> <input name="b" id="sb" value="" title="&aboutTor.search.label;" diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd index 6f63ff7..771f8ae 100644 --- a/src/chrome/locale/en/aboutTor.dtd +++ b/src/chrome/locale/en/aboutTor.dtd @@ -25,6 +25,7 @@ <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> +<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/en/aboutTor.properties b/src/chrome/locale/en/aboutTor.properties index 02088f0..d607324 100644 --- a/src/chrome/locale/en/aboutTor.properties +++ b/src/chrome/locale/en/aboutTor.properties @@ -13,3 +13,9 @@ aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>. +# The following string is a link which replaces %1$S above. +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/

1 0

[torbutton/master] fixup! Bug 9387: Bind jar: pref to security slider
by mikeperry＠torproject.org 12 Feb '15

12 Feb '15

commit 1e727db8e063928d48d1bfbcdedd7bc7f64295f1 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 11 16:54:29 2015 -0800 fixup! Bug 9387: Bind jar: pref to security slider Fix a missing :. --- src/chrome/content/torbutton.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 752206e..2fa7189 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2161,7 +2161,7 @@ var torbutton_sec_ml_bool_prefs = { "javascript.options.asmjs" : false, "noscript.forbidMedia" : true, "media.webaudio.enabled" : false, - "network.jar.block-remote-files", true, + "network.jar.block-remote-files" : true, // XXX: pref for disabling MathML is missing };

1 0

[torbutton/master] Bug 11236: Don't set search engines in extension
by mikeperry＠torproject.org 12 Feb '15

12 Feb '15

commit 4c35e375ff74614b84ff722e9214d757fed07b01 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 23 12:09:45 2015 +0000 Bug 11236: Don't set search engines in extension We risk search engine names getting translated which results in broken search boxes if we expose them in locale files. As we only use en-US search engines (i.e. no localized ones) we can avoid that risk by removing these language strings and adding the search engines names directly into a central preference file shared by all localized bundles. --- src/chrome/locale/en/browser.properties | 8 -------- src/defaults/preferences/preferences.js | 6 +----- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/chrome/locale/en/browser.properties b/src/chrome/locale/en/browser.properties index 295a03a..8849b67 100644 --- a/src/chrome/locale/en/browser.properties +++ b/src/chrome/locale/en/browser.properties @@ -3,11 +3,3 @@ browser.startup.homepage=about:tor # Spell checker dictionary spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 3e02b77..c6fb8e4 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -225,10 +225,6 @@ pref("extensions.torbutton.cookie_js_allow", true); pref("extensions.torbutton.prompt_torbrowser", true); pref("extensions.torbutton.confirm_plugins", true); -// Browser home page, spell checker dictionary, and search engine overrides: +// Browser home page, and spell checker dictionary: pref("browser.startup.homepage", "chrome://torbutton/locale/browser.properties"); pref("spellchecker.dictionary", "chrome://torbutton/locale/browser.properties"); -pref("browser.search.defaultenginename", "chrome://torbutton/locale/browser.properties"); -pref("browser.search.order.1", "chrome://torbutton/locale/browser.properties"); -pref("browser.search.order.2", "chrome://torbutton/locale/browser.properties"); -pref("browser.search.order.3", "chrome://torbutton/locale/browser.properties");

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] Bug 14490: Make Disconnect the default search engine
by mikeperry＠torproject.org 12 Feb '15

12 Feb '15

commit b4d03579fda41c3005f52979b25f29278ee2fe0c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 11 16:22:50 2015 -0800 Bug 14490: Make Disconnect the default search engine --- browser/app/profile/000-tor-browser.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 54fa6e3..0d5faa6 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -150,14 +150,14 @@ pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\" // Putting the search engine prefs into this file to fix #11236. // Default search engine -pref("browser.search.defaultenginename", "Startpage"); +pref("browser.search.defaultenginename", "Disconnect"); // Search engine order (order displayed in the search bar dropdown) -// Somewhat surprisingly we get Startpage - DuckDuckGo - Google as the order +// Somewhat surprisingly we get Disconnect - YouTube - Twitter as the order // only if we set them as below. -pref("browser.search.order.extra.1", "DuckDuckGo"); -pref("browser.search.order.extra.2", "Google"); -pref("browser.search.order.extra.3", "Startpage"); +pref("browser.search.order.extra.1", "YouTube"); +pref("browser.search.order.extra.2", "Twitter"); +pref("browser.search.order.extra.3", "Disconnect"); // Hacks/workarounds: Direct2D seems to crash w/ lots of video cards w/ MinGW? // Nvida cards also experience crashes without the second pref set to disabled

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] Omnibox: Add disconnect, youtube; remove Amazon and eBay
by mikeperry＠torproject.org 12 Feb '15

12 Feb '15

commit 43f9335cb0e47d104340faf8a535db754a4d73f0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 11 15:33:35 2015 -0800 Omnibox: Add disconnect, youtube; remove Amazon and eBay eBay and Amazon don't treat Tor users very well. Accounts often get locked and payments reversed. --- browser/locales/en-US/searchplugins/bing.xml | 6 +++--- browser/locales/en-US/searchplugins/disconnect.xml | 10 ++++++++++ browser/locales/en-US/searchplugins/list.txt | 12 ++++++------ browser/locales/en-US/searchplugins/youtube.xml | 10 ++++++++++ 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/browser/locales/en-US/searchplugins/bing.xml b/browser/locales/en-US/searchplugins/bing.xml index d416b44..f9a2a85 100644 --- a/browser/locales/en-US/searchplugins/bing.xml +++ b/browser/locales/en-US/searchplugins/bing.xml @@ -9,12 +9,12 @@ <Image width="16" height="16">data:image/x-icon;base64,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</Image> <Image width="65" height="26">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAAEEAAAAaCAYAAADovjFxAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NDkxMSwgMjAxMy8xMC8yOS0xMTo0NzoxNiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChNYWNpbnRvc2gpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVBOTQzNENBQzQxNDExRTM5RURBRUU5NUU4QkU3NjA4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVBOTQzNENCQzQxNDExRTM5RURBRUU5NUU4QkU3NjA4Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOm luc3RhbmNlSUQ9InhtcC5paWQ6NzU2RTRERkZDMzc1MTFFMzlFREFFRTk1RThCRTc2MDgiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NzU2RTRFMDBDMzc1MTFFMzlFREFFRTk1RThCRTc2MDgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz76XOiPAAAD1ElEQVR42uyYeUgVQRzH9+nLNE07kMKIiqAkSaUIMgUpyu6eHdBhVBSBZQf1R4XkP0WHFUURWBlRmGGHdkI3nWIXVHZIaNkhFXmWYni+vhPfhWHZfbvvqVjZDz7Mzs6w8+Y3v2ue3eFwPFUU5R64CG6BRqWDiReIBCvBNfAeHAXjOpoSqqV+H7AQbO1oStCTz/+VoCjONlpvDdgPelqc3x8kgMD2UEJbSTRIAkMszhfB+jhIbU8lxIIZrbjeV7b1FudngefgansqoQ5kg3cgDUwBXVthXavutoXZ61x7KuEBOAkGgESap0ijGWAeCPZwXZv0bNf0PZFObuzX7klM2Kjp9wDzQSYVcgWsAqFubD4fjAIloAE0g0sgXDN/Li1xBPt+IAcks3+KViXc6xmYbrDuGBaETVzvFegHloKzVpRQBK4bjHUB48FeUADyQDcX32pmuxPkgkr6vahaJ9P/Q3Vi0mD2fbjRdeAln4VSboIIPkdp1lzA8RjuQ1h2CA9wH4i3mh2SLc4bCQJMYozCDDEbDOVpDwPLOHZGml/KtlpSongOArV0g5lgLFguxRFVxGaP0VrCQByYA7pT+b7ie1aV8ASMBhdM5jWY3D3UgLiLpizLAfCGP3agi2/4s43RvE+jucdKbpfEdjV4reNqVSLQu1Mn3AYOxoTcFgawHIPxbLZhJsHtg0Ga/cJxVdkTdKxLlnxFL1JKvqcn4oQWMai0RAk/DcarpFjjSmpN3E2uOOX 6RCuNrpTQWdPvC9ZL5uVqk3YL7mBUJ4SwLTdZx2gNb4P1vA3c1McoRZaBxXwWAWgbM0SShZN+KJ2mnqgm3MtgXE1xL1qpDiowca8IReM/ClNUMH1OpKG3YIML91DlB1jL7FDjYp56Grt1xmbRzfJcmK9VUS0ik+0OnTmbWf3WeEkbPMQSdRqVkGrxtncYDAJ7LMwNlE6mhEXXRLAdnOZYgjTfTxNLbJrvaCVI009nPRDH+0c8mMrALIrAQuFaduZeUUAcAZeliGom92kl7mSKeqbRSSyYMqSxYiqgWHpXw/l1ko+LfoXB98s1dUoTrfMEFREnjQ1nbbHE5nA4vvOCFGlxI2UsntI9MNNARn7V3KNobd/AI535AaSSirAxnjTyd2glmK6g507hDPBCsXf47qN4J5SQyELDihykAir+gT+U/KmQIi9WasKn75qYfjRvkn+bAoINAud5Pqeo+baQ5WYK2KT5EySFwe9vFF+6Win/kxAn35sls3oLzbLrpI0b3PRjsMIk5f3pYmPsSuC1WZVPrH9+hwGb0+lUOrr8EmAAiqTecoRlgJMAAAAASUVORK5CYII=</Image> <Image width="130" height="52">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAAIIAAAA0CAYAAABGkOCVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NDkxMSwgMjAxMy8xMC8yOS0xMTo0NzoxNiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChNYWNpbnRvc2gpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjc1NkU0REZEQzM3NTExRTM5RURBRUU5NUU4QkU3NjA4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjc1NkU0REZFQzM3NTExRTM5RURBRUU5NUU4QkU3NjA4Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmO mluc3RhbmNlSUQ9InhtcC5paWQ6NzU2RTRERkJDMzc1MTFFMzlFREFFRTk1RThCRTc2MDgiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NzU2RTRERkNDMzc1MTFFMzlFREFFRTk1RThCRTc2MDgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5lzzn9AAAIPUlEQVR42uxdCWwVRRie0gqtFwTQGIyAXJYABry4VLwPQFsFAcUjeKAGotEoAQ8UFC80EhVUFBUUFCogGApFVMIRzqgIaGlEKArKoaBSrkLr/2W/l0wn+97bbXfbpW++5Evf7pvdtzvzz3/NP5BWXl6uLCzScnJyNsnf5cLPhN8KS223pB4yhG3IQcLtwhXCucJ5wr9tF6UG6gj/047PFPYVThEWCxcLHxOeY7uq9gtCPJws7CEcKywUrhNea7ss9QTBxLnCi2yXWUFQ1mewgmBhBcHCCsLxjRbCkcIr7DCntiCcKhwl/Fq4WXh5CL9xt3CRcIaw7fHcWRm1WBAOGdqhk3Iyp0EhVzhJO4agnS3cbzVCtLEv4PvlGseNhc1S0TRkCuulsFmdaRwX0wSlnCBk0D5OoFo8McUE4UvhffRBIBSXGuYoZXwE2MJlwuHCB4V7lLNQhQUrrGbuTAFheJ9M+ahhhDbgsJF3cXYUUyjuUc7KpkUKOIsvu5yD79CTswX1DqupOdrZLq+9goAQ6liSNhcKXxRuEP4oHEebmmaHoPbkEf4VviF8xGP7DuTDwm30M2YLF/JeYcEUuoHCfsKWyllyR83ebuH3wg+Eq5Lc7wRhf2FdHv+snKKeRG1+ES7Rvr9X2EfYXJjFCbVDmC98S1WsFfGK3nyv9sKGmj/3k/BjOrmK2rkzPx9BqRo6/xSPPzJUON7lPApafg8gzocJ+YL+xbYq3i+bg6N3+iS+/C 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</Image> - <Url type="application/x-suggestions+json" template="http://api.bing.com/osjson.aspx"> + <Url type="application/x-suggestions+json" template="https://api.bing.com/osjson.aspx"> <Param name="query" value="{searchTerms}"/> <Param name="form" value="OSDJAS"/> <Param name="language" value="{moz:locale}"/> </Url> - <Url type="text/html" method="GET" template="http://www.bing.com/search"> + <Url type="text/html" method="GET" template="https://www.bing.com/search"> <Param name="q" value="{searchTerms}"/> <MozParam name="pc" condition="pref" pref="ms-pc"/> <MozParam name="form" condition="purpose" purpose="contextmenu" value="MOZCON"/> @@ -23,5 +23,5 @@ <MozParam name="form" condition="purpose" purpose="keyword" value="MOZLBR"/> <MozParam name="form" condition="purpose" purpose="newtab" value="MOZTSB"/> </Url> - <SearchForm>http://www.bing.com/search</SearchForm> + <SearchForm>https://www.bing.com/search</SearchForm> </SearchPlugin> diff --git a/browser/locales/en-US/searchplugins/disconnect.xml b/browser/locales/en-US/searchplugins/disconnect.xml new file mode 100644 index 0000000..40c512f --- /dev/null +++ b/browser/locales/en-US/searchplugins/disconnect.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> + <ShortName>Disconnect</ShortName> + <LongName>Disconnect Private Search</LongName> + <Description>Private searches using disconnect.me</Description> + <Url type="text/html" method="POST" template="https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> + <Param name="query" value="{searchTerms}"/> + </Url> + <Image height="16" width="16" type="image/icon">data:image/x-icon;base64, AAABAAEAEBAAAAAAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAD///8B////Af///xP///9H////ff///43///+B////af///0X///8f////B////xP///9H////ff///4////9r////Af///wH///8Zd3d3r0NDQ/9BQUH/Tk5O925ubuGxsbGt////X////yX///8fd3d3rzs7O/8qKir/IiIi/////xP///8Z////LXp6erNERET/RERE/0NDQ/8+Pj7/MjIy/3BwcNX///9b////MXR0dK06Ojr/Kioq/yIiIv////9H////X////2d4eHi5Pj4+/0JCQv9ERET/Q0ND/zs7O/8wMDD/eXl5x////01iYmKjMjIy/ycnJ/8iIiL/fn5+v4eHh9N/f3/PUFBQ1UFBQc9BQUHlQ0ND/0RERP9AQED/NTU1/yoqKv/Jycl9WVlZey8vL8csLCzJKioqx0JCQv83Nzf/KCgo/0BAQN3///8l////A3Nzc1dISEj1Q0ND/zk5Of8pKSn/VVVVz////yn///8B////Af///wFCQkL/Nzc3/ygoKP9AQEDd////Jf///wH///8Nb29vpURERP87Ozv/Kioq/zIyMvH///8v////Af///wH///8BQkJC/zc3N/8oKCj/QEBA3f///yX///8B////Da2trWtDQ0P/Ozs7/yoqKv8iIiL/////L////wH///8B////AUJCQv83Nzf/KCgo/0FBQd3///8l////Bf///yW9vb2FQkJC/zg4OP8pKSn/IiIi/////yf///8B////Af///wFCQkL/Ojo6/y4uLv9LS0vh////Rf///zf///9jioqKzUBAQP8zMzP/JiYm/zMzM+H///8Z// //Af///wH///8BQ0ND/z8/P/87Ozv/Xl5e6f///4v///+PmpqazUNDQ/86Ojr/LS0t/yQkJP9ERESp////C////wH///8B////AURERP9DQ0P/Q0ND/0xMTPtoaGjtRERE/0NDQ/89PT3/MTEx/yYmJv8iIiL/e3t7Nf///wH///8B////Af///wFERET/RERE/0RERP9DQ0P/QkJC/0BAQP87Ozv/MTEx/ycnJ/8jIyP/RkZGc////wX///8B////Af///wH///8BOzs7/zs7O/87Ozv/Ojo6/zc3N/8zMzP/LS0t/yYmJv8jIyP/Ozs7ff///wX///8B////Af///wH///8B////ASoqKv8qKir/Kioq/yoqKv8pKSn/JiYm/y0tLckyMjKbU1NTKf///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8BAAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//w==</Image> +</OpenSearchDescription> diff --git a/browser/locales/en-US/searchplugins/list.txt b/browser/locales/en-US/searchplugins/list.txt index 0466f4e..0d07ea6 100644 --- a/browser/locales/en-US/searchplugins/list.txt +++ b/browser/locales/en-US/searchplugins/list.txt @@ -1,9 +1,9 @@ -amazondotcom -bing -duckduckgo -eBay -google -startpage +disconnect +youtube twitter wikipedia +startpage yahoo +bing +google +duckduckgo diff --git a/browser/locales/en-US/searchplugins/youtube.xml b/browser/locales/en-US/searchplugins/youtube.xml new file mode 100644 index 0000000..42b04c0 --- /dev/null +++ b/browser/locales/en-US/searchplugins/youtube.xml @@ -0,0 +1,10 @@ +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> +<os:ShortName>YouTube</os:ShortName> +<os:Description>YouTube - Videos</os:Description> +<os:InputEncoding>UTF-8</os:InputEncoding> +<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAABMLAAATCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgNkQkIDZGiCA2RzAgNkcwIDZH/CA2R/wgNkf8IDZH/CA2R/wgNkf8IDZH/CA2R2AgNkcwIDZHMCA2RhAgNkQYIDpWHCA6V/wgOlf8IDpX/CA6V/wgOlf8IDpX/CA6V/wgOlf8IDpX/CA6V/wgOlf8IDpX/CA6V/wgOlf8IDpWHCQ6ZzAkOmf8JDpn/CQ6Z/wkOmf8JDpb/BQhc/wgMgf8JDpn/CQ6Z/wkOmf8JDpn/CQ6Z/wkOmf8JDpn/CQ6ZzAkOnuoJDp7/CQ6e/wkOnv8JDp7/Exed/8jIy/9RU4j/Bwp0/wkOm/8JDp7/CQ6e/wkOnv8JDp7/CQ6e/wkOnuoJD6T8CQ+k/wkPpP8JD6T/CQ+k/xUbo//V1dX/1dXV/4yNrP8QFG//CA6Y/wkPpP8JD6T/CQ+k/wkPpP8JD6T8CQ+q/wkPqv8JD6r/CQ+q/wkPqv8WG6n/3d3d/93d3f/d3d3/v7/M/y0wjv8JD6r/CQ+q/wkPqv8JD6r/CQ+q/woQr/8KEK//ChCv/woQr/8KEK//Fx2v/+fn5//n5+f/5+fn/+jo6P+YmtP/ChCv/woQr/8KEK//ChCv/woQr/8KELX8ChC1/woQtf8KELX/ChC1/xgdtf/x8fH/8fHx//Ly8v+bndv/Ehi3/woQtf8KELX/ChC1/woQtf8KELX8ChG 76goRu/8KEbv/ChG7/woRu/8YH77/+fn5/+/v9/9fY9H/ChG7/woRu/8KEbv/ChG7/woRu/8KEbv/ChG76goRwMwKEcD/ChHA/woRwP8KEcD/EBfB/6Ol5/8tM8n/ChHA/woRwP8KEcD/ChHA/woRwP8KEcD/ChHA/woRwMwLEcSHCxHE/wsRxP8LEcT/CxHE/wsRxP8LEcT/CxHE/wsRxP8LEcT/CxHE/wsRxP8LEcT/CxHE/wsRxP8LEcSHCxLICQsSyKULEsjMCxLI+QsSyP8LEsj/CxLI/wsSyP8LEsj/CxLI/wsSyP8LEsj/CxLI0gsSyMwLEsiiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAP//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAD//wAA//8AAA==</os:Image> +<SearchForm>https://www.youtube.com/index</SearchForm> +<os:Url type="text/html" method="GET" template="https://www.youtube.com/results?search_query={searchTerms}&search=Search" resultDomain="youtube.com"> +</os:Url><os:Url type="application/x-suggestions+json" method="GET" template="https://suggestqueries.google.com/complete/search?output=firefox&ds=yt&…" resultDomain="suggestqueries.google.com"> +</os:Url> +</SearchPlugin>

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] Bug 14392: Make about:tor behave like other initial pages.
by mikeperry＠torproject.org 12 Feb '15

12 Feb '15

commit 573a734b7b15d68672724403ab23dd23531bfdae Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 11 16:45:24 2015 -0800 Bug 14392: Make about:tor behave like other initial pages. --- browser/base/content/browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 05bea9d..1384e66 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -159,6 +159,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "TabCrashReporter", #endif let gInitialPages = [ + "about:tor", "about:blank", "about:newtab", "about:home",

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 12 Feb '15

12 Feb '15

commit 510f2ddd444a7e656ae2cf872731226b84401b53 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 26 12:55:25 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. We add the search engine defaults directly to our central preference file in order to avoid issues like #11236 where search engine names get translated. --- browser/app/profile/000-tor-browser.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index dff718a..54fa6e3 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -148,8 +148,16 @@ pref("xpinstall.whitelist.add.36", ""); // Toolbar layout pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\",\"downloads-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"noscript-tbb\",\"torbutton-button\",\"urlbar-container\",\"search-container\",\"webrtc-status-button\",\"social-share-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"]},\"seen\":[],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\",\"PanelUI-contents\",\"addon-bar\"],\"newElementCount\":0}"); -// Omnibox settings -pref("keyword.URL", "https://startpage.com/do/search?q="); +// Putting the search engine prefs into this file to fix #11236. +// Default search engine +pref("browser.search.defaultenginename", "Startpage"); + +// Search engine order (order displayed in the search bar dropdown) +// Somewhat surprisingly we get Startpage - DuckDuckGo - Google as the order +// only if we set them as below. +pref("browser.search.order.extra.1", "DuckDuckGo"); +pref("browser.search.order.extra.2", "Google"); +pref("browser.search.order.extra.3", "Startpage"); // Hacks/workarounds: Direct2D seems to crash w/ lots of video cards w/ MinGW? // Nvida cards also experience crashes without the second pref set to disabled

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] fixup! Bug #4902: Add DDG and StartPage to Omnibox.
by mikeperry＠torproject.org 12 Feb '15

12 Feb '15

commit d653d7bdff8e36366d551968dfac1cad9cd1dbef Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 23 12:03:52 2015 +0000 fixup! Bug #4902: Add DDG and StartPage to Omnibox. We don't mess with the region.properties anymore as this is fragile: Translators start to translate the search engine names (see #11236). We put the necessary values into our central preference file, 000-tor-browser.js, instead of overriding the values set in the respective locales. --- browser/locales/en-US/chrome/browser-region/region.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties index 16963f3..e078ed5 100644 --- a/browser/locales/en-US/chrome/browser-region/region.properties +++ b/browser/locales/en-US/chrome/browser-region/region.properties @@ -3,12 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Default search engine -browser.search.defaultenginename=Startpage +browser.search.defaultenginename=Google # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google +browser.search.order.1=Google +browser.search.order.2=Yahoo +browser.search.order.3=Bing # This is the default set of web based feed handlers shown in the reader # selection UI

1 0

[torbutton/master] Bug 9387: Bind jar: pref to security slider
by mikeperry＠torproject.org 11 Feb '15

11 Feb '15

commit 47ff237d15353ca6658fd1a4ef09aa0c6c993cc3 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 30 16:22:49 2015 +0000 Bug 9387: Bind jar: pref to security slider We are binding the preference governing the jar: protocol handler to the security slider (see #12430 for more details). --- src/chrome/content/torbutton.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 9cdb792..567574f 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -234,6 +234,7 @@ var torbutton_unique_pref_observer = case "javascript.options.asmjs": case "noscript.forbidMedia": case "media.webaudio.enabled": + case "network.jar.block-remote-files": case "javascript.options.baselinejit.content": case "noscript.forbidFonts": case "gfx.font_rendering.graphite.enabled": @@ -2160,6 +2161,7 @@ var torbutton_sec_ml_bool_prefs = { "javascript.options.asmjs" : false, "noscript.forbidMedia" : true, "media.webaudio.enabled" : false, + "network.jar.block-remote-files", true, // XXX: pref for disabling MathML is missing };

1 0

[torbutton/master] Merge remote-tracking branch 'gk/bug_9387_12430'
by mikeperry＠torproject.org 11 Feb '15

11 Feb '15

commit 0633db0e9cabaf83b035d0eb44a97155b37675b4 Merge: a99ed67 47ff237 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 11 15:06:47 2015 -0800 Merge remote-tracking branch 'gk/bug_9387_12430' src/chrome/content/torbutton.js | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 11 Feb '15

11 Feb '15

commit c8a640f0818a968170149dad9bd8ebc1198ee9f1 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 30 16:13:06 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index fd0a35c..dff718a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -160,6 +160,11 @@ pref("layers.acceleration.disabled", true); // in FF24. This is a dangerous combination (spotted by iSec) pref("media.audio_data.enabled", false); +// If true, remote JAR files will not be opened, regardless of content type +// Patch done by Jeff Gibat (iSEC). We bind it to the security slider but allow +// jar: in default mode. +pref("network.jar.block-remote-files", false); + // Enable TLS 1.1 and 1.2: // https://trac.torproject.org/projects/tor/ticket/11253 pref("security.tls.version.max", 3);

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] Bug 12430: Disable external jar: via preference
by mikeperry＠torproject.org 11 Feb '15

11 Feb '15

commit a4a1c52ccc7f8e5f60c2d0e35d40b3b5f5ddd71f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 30 16:05:21 2015 +0000 Bug 12430: Disable external jar: via preference This is a patch written by Jeff Gibat (iSECPartners) to disable the jar: protocol handler via a preference. The preference is bound to the security slider settings (#9387). --- modules/libjar/nsJARChannel.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/libjar/nsJARChannel.cpp b/modules/libjar/nsJARChannel.cpp index d190973..f958554 100644 --- a/modules/libjar/nsJARChannel.cpp +++ b/modules/libjar/nsJARChannel.cpp @@ -898,6 +898,12 @@ nsJARChannel::OnDownloadComplete(nsIDownloader *downloader, mContentDisposition = NS_GetContentDispositionFromHeader(mContentDispositionHeader, this); } + // here we check preferences to see if all remote jar support should be disabled + if (Preferences::GetBool("network.jar.block-remote-files", true)) { + mIsUnsafe = true; + status = NS_ERROR_UNSAFE_CONTENT_TYPE; + } + if (NS_SUCCEEDED(status) && mIsUnsafe && !Preferences::GetBool("network.jar.open-unsafe-types", false)) { status = NS_ERROR_UNSAFE_CONTENT_TYPE;

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] fixup! Bug 12430: Disable external jar: via preference
by mikeperry＠torproject.org 11 Feb '15

11 Feb '15

commit cc60be8eee7b39138adb44c09d0905f8fb7fb0c9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 11 14:52:15 2015 -0800 fixup! Bug 12430: Disable external jar: via preference Actually, we should block remote JARs before the load. --- modules/libjar/nsJARChannel.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/libjar/nsJARChannel.cpp b/modules/libjar/nsJARChannel.cpp index f958554..6fcdac8 100644 --- a/modules/libjar/nsJARChannel.cpp +++ b/modules/libjar/nsJARChannel.cpp @@ -764,6 +764,12 @@ nsJARChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctx) if (NS_FAILED(rv)) return rv; + // Check preferences to see if all remote jar support should be disabled + if (!mJarFile && Preferences::GetBool("network.jar.block-remote-files", true)) { + mIsUnsafe = true; + return NS_ERROR_UNSAFE_CONTENT_TYPE; + } + // These variables must only be set if we're going to trigger an // OnStartRequest, either from AsyncRead or OnDownloadComplete. // @@ -898,7 +904,8 @@ nsJARChannel::OnDownloadComplete(nsIDownloader *downloader, mContentDisposition = NS_GetContentDispositionFromHeader(mContentDispositionHeader, this); } - // here we check preferences to see if all remote jar support should be disabled + // This is a defense-in-depth check for the preferences to see if all remote jar + // support should be disabled. This check may not be needed. if (Preferences::GetBool("network.jar.block-remote-files", true)) { mIsUnsafe = true; status = NS_ERROR_UNSAFE_CONTENT_TYPE;

1 0

[tor-browser-bundle/maint-4.0] Bug 14849: Remove new NoScript option to make permissions permanent
by mikeperry＠torproject.org 11 Feb '15

11 Feb '15

commit b7c8d8fe373e015d9d2a646f61d368756bc68d53 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Feb 10 16:55:57 2015 -0800 Bug 14849: Remove new NoScript option to make permissions permanent --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + 3 files changed, 3 insertions(+) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 3b8e31e..39fa6a9 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -59,3 +59,4 @@ pref("noscript.autoReload", true); pref("noscript.autoReload.allTabs", false); pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); +pref("noscript.showVolatilePrivatePermissionsToggle", false); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 3b8e31e..39fa6a9 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -59,3 +59,4 @@ pref("noscript.autoReload", true); pref("noscript.autoReload.allTabs", false); pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); +pref("noscript.showVolatilePrivatePermissionsToggle", false); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 02cee1b..f5a3f3c 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -59,3 +59,4 @@ pref("noscript.autoReload", true); pref("noscript.autoReload.allTabs", false); pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); +pref("noscript.showVolatilePrivatePermissionsToggle", false);

1 0

[tor-browser-bundle/master] Bug 14849: Remove new NoScript option to make permissions permanent
by mikeperry＠torproject.org 11 Feb '15

11 Feb '15

commit c5e6ba341a3cda60cad0fb905213423ad6279b40 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Feb 10 16:55:57 2015 -0800 Bug 14849: Remove new NoScript option to make permissions permanent --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + 3 files changed, 3 insertions(+) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 3b8e31e..39fa6a9 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -59,3 +59,4 @@ pref("noscript.autoReload", true); pref("noscript.autoReload.allTabs", false); pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); +pref("noscript.showVolatilePrivatePermissionsToggle", false); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 3b8e31e..39fa6a9 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -59,3 +59,4 @@ pref("noscript.autoReload", true); pref("noscript.autoReload.allTabs", false); pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); +pref("noscript.showVolatilePrivatePermissionsToggle", false); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 02cee1b..f5a3f3c 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -59,3 +59,4 @@ pref("noscript.autoReload", true); pref("noscript.autoReload.allTabs", false); pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); +pref("noscript.showVolatilePrivatePermissionsToggle", false);

1 0

[torbutton/master] Bug 13406: Stop directing users to download-easy.html.en
by mikeperry＠torproject.org 10 Feb '15

10 Feb '15

commit 2ccb9cb66415e4f5de5fc4b496272921cac6614f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Feb 9 11:19:33 2015 -0500 Bug 13406: Stop directing users to download-easy.html.en Always display a "Check for Tor Browser Update..." menu item (to avoid localization issues, the menu item label entity was not renamed). When the menu item is chosen, open the Update Service prompt window to perform the update check. --- src/chrome/content/popup.xul | 7 +++---- src/chrome/content/torbutton.js | 30 +++++++++--------------------- src/chrome/locale/en/aboutTor.dtd | 4 ++-- src/chrome/locale/en/torbutton.dtd | 2 +- src/chrome/skin/torbutton.css | 4 ++-- 5 files changed, 17 insertions(+), 30 deletions(-) diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index 5f12f2b..e61dcfe 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -37,13 +37,12 @@ label="&torbutton.context_menu.networksettings;" accesskey="&torbutton.context_menu.networksettings.key;" oncommand="torbutton_open_network_settings()"/> - <menuseparator hidden="true"/> - <menuitem id="torbutton-downloadUpdate" + <menuseparator/> + <menuitem id="torbutton-checkForUpdate" label="&torbutton.context_menu.downloadUpdate;" accesskey="&torbutton.context_menu.downloadUpdate.key;" insertafter="context-stop" - oncommand="torbutton_download_update()" - hidden="true"/> + oncommand="torbutton_check_for_update()"/> </vbox> <vbox>  @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> <!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update."> +<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update."> <!ENTITY aboutTor.check.label "Test Tor Network Settings"> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 72c7d41..9709670 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -32,7 +32,7 @@ <!ENTITY torbutton.context_menu.about.key "A"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> diff --git a/src/chrome/skin/torbutton.css b/src/chrome/skin/torbutton.css index f368c9c..2c6bbfb 100644 --- a/src/chrome/skin/torbutton.css +++ b/src/chrome/skin/torbutton.css @@ -101,7 +101,7 @@ statusbarpanel#plugins-status[status="0"] { list-style-image: url("chrome://torbutton/skin/poff.png"); } -#torbutton-downloadUpdate { +#torbutton-checkForUpdate[tbUpdateNeeded] { font-weight: bold; } @@ -118,4 +118,4 @@ svg#tor-circuit circle.node-circle { stroke: #195021; stroke-width: 2px; fill: white; -} \ No newline at end of file +}

1 0

[torbutton/master] Bug 9387: Be smarter when leaving custom mode
by mikeperry＠torproject.org 10 Feb '15

10 Feb '15

commit a717611c4d067d77f561781f37d4d90196262f5b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 4 16:55:55 2015 +0000 Bug 9387: Be smarter when leaving custom mode We are leaving custom mode now if the user manages it to undo all security slider related preference changes manually. If, on the other hand, the user changes a relevant preference while being in one of the four regular slider modes we don't bother checking all preferences and switch to the custom mode immediately. --- src/chrome/content/torbutton.js | 183 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 172 insertions(+), 11 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 9cdb792..99b3e50 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -243,17 +243,29 @@ var torbutton_unique_pref_observer = case "media.opus.enabled": case "media.wave.enabled": case "media.apple.mp3.enabled": - // XXX: This logic is bad.. Instead, we need a check here - // that only sets custom if the prefs differ from the current - // security slider level (and also can set it back if they are the same). + // |m_tb_slider_update| is only set if the user updated a + // preference under control of the security slider via the + // slider on the Torbutton dialog. This in turn means we can + // skip the code dealing with setting/unsetting the custom mode + // in this case. if (!m_tb_sliderUpdate) { - // Do we already have custom settings? - let customSlider = m_tb_prefs. - getBoolPref("extensions.torbutton.security_custom"); - if (!customSlider) { - m_tb_prefs. - setBoolPref("extensions.torbutton.security_custom", true); - } + // Do we already have custom settings? + let customSlider = m_tb_prefs. + getBoolPref("extensions.torbutton.security_custom"); + // A preference governed by the security slider got changed + // but we are not in custom mode yet. Change that. + if (!customSlider) { + m_tb_prefs. + setBoolPref("extensions.torbutton.security_custom", + true); + } else { + // We are in custom mode. Check whether all prefs are + // reset and reset the mode if so. Otherwise we remain + // in custom mode. + torbutton_log(4, "custom mode and we got: " + data); + torbutton_security_slider_custom_check(m_tb_prefs. + getIntPref("extensions.torbutton.security_slider")); + } } break; } @@ -2272,7 +2284,7 @@ function torbutton_update_security_slider() { m_tb_prefs.setBoolPref(p, torbutton_sec_mh_bool_prefs[p]) // noscript.globalHttpsWhitelist is special: We don't want it in this // mode. - if (p == "noscript.globalHttpsWhitelist") { + if (p === "noscript.globalHttpsWhitelist") { m_tb_prefs.setBoolPref(p, !torbutton_sec_mh_bool_prefs[p]) } } @@ -2293,6 +2305,155 @@ function torbutton_update_security_slider() { m_tb_sliderUpdate = false; } +// The user (re)set a pref which is relevant to the security slider while she +// was in custom mode. Check whether the preference values fit to the mode which +// is still on the slider. Iff so, we are leaving the custom mode. +function torbutton_security_slider_custom_check(mode) { + let capValue = m_tb_prefs.getCharPref("capability.policy.maonoscript.sites"); + switch (mode) { + case 1: + for (p in torbutton_sec_l_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_l_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_ml_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_ml_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_mh_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_mh_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_h_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_h_bool_prefs[p]) { + return; + } + } + if (m_tb_prefs.getCharPref("general.useragent.locale") !== "ko" || + m_tb_prefs.getCharPref("general.useragent.locale") !== "vi" || + m_tb_prefs.getCharPref("general.useragent.locale") !== "zh-CN") { + + if (m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { + return; + } + } else { + if (!m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { + return; + } + } + // We are still here which means all preferences are properly reset. Leave + // custom mode. + m_tb_prefs.setBoolPref("extensions.torbutton.security_custom", false); + break; + case 2: + for (p in torbutton_sec_l_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_l_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_ml_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_ml_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_mh_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_mh_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_h_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_h_bool_prefs[p]) { + return; + } + } + if (m_tb_prefs.getCharPref("general.useragent.locale") !== "ko" || + m_tb_prefs.getCharPref("general.useragent.locale") !== "vi" || + m_tb_prefs.getCharPref("general.useragent.locale") !== "zh-CN") { + + if (m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { + return; + } + } else { + if (!m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { + return; + } + } + // We are still here which means all preferences are properly reset. Leave + // custom mode. + m_tb_prefs.setBoolPref("extensions.torbutton.security_custom", false); + break; + case 3: + for (p in torbutton_sec_l_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_l_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_ml_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_ml_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_mh_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_mh_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_h_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_h_bool_prefs[p]) { + // We have the whitelist and JavaScript is disabled in medium-high + // mode as well. + if (p === "noscript.global") { + continue; + } + return; + } + } + if (m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { + return; + } + // We are still here which means all preferences are properly reset. Leave + // custom mode. + m_tb_prefs.setBoolPref("extensions.torbutton.security_custom", false); + break; + case 4: + for (p in torbutton_sec_l_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_l_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_ml_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_ml_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_mh_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_mh_bool_prefs[p]) { + // We don't want to have the whitelist in high mode. JavaScript is + // disabled globally. + if (p === "noscript.globalHttpsWhitelist") { + continue; + } + return; + } + } + for (p in torbutton_sec_h_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_h_bool_prefs[p]) { + return; + } + } + if (!m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { + return; + } + // We are still here which means all preferences are properly reset. Leave + // custom mode. + m_tb_prefs.setBoolPref("extensions.torbutton.security_custom", false); + break; + } +} + // Bug 1506 P0: This code is a toggle-relic. // // It basically just enforces the three Torbutton prefs

1 0

[torbutton/master] Use unicode elipsis in new menus.
by mikeperry＠torproject.org 10 Feb '15

10 Feb '15

commit a99ed677a29482999e99dd08e3e9208d91fd0f6f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Feb 10 14:02:22 2015 -0800 Use unicode elipsis in new menus. Might as well standardize on this, rather than going back and forth. --- src/chrome/locale/en/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 9709670..7a4284f 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -32,7 +32,7 @@ <!ENTITY torbutton.context_menu.about.key "A"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update…"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C">

1 0

[torbutton/master] Bug 9387: Unlock the slider if "custom" is set
by mikeperry＠torproject.org 10 Feb '15

10 Feb '15

commit dd28b7b49cfc775afcc0adf9b922193acded9a7f Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 4 13:08:12 2015 +0000 Bug 9387: Unlock the slider if "custom" is set If the custom mode is checked allow disabling it on the preference dialog directly by clicking on the description or dragging the thumb. --- src/chrome/content/preferences.js | 29 +++++++++++++---------------- src/chrome/content/preferences.xul | 1 - 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index f67906c..1151176 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -189,12 +189,15 @@ function torbutton_prefs_init(doc) { let sec_custom = doc.getElementById('torbutton_sec_custom'); let custom_values = o_torprefs.getBoolPref('security_custom'); sec_slider.value = o_torprefs.getIntPref('security_slider'); - sec_slider.disabled = custom_values; - // Setting |disabled| to |false| is not enough to have the element - // non-responding. We need to handle |movetoclick| as well. - sec_slider.setAttribute("movetoclick", !custom_values); sec_custom.checked = custom_values; sec_custom.disabled = !custom_values; + // If the custom checkbox is checked and the user is done with dragging + // uncheck the checkbox to allow setting the (newly) chosen security level. + sec_slider.dragStateChanged = function(isDragging) { + if (!isDragging && sec_custom.checked) { + sec_custom.checked = false; + } + } torbutton_prefs_set_field_attributes(doc); } @@ -462,17 +465,11 @@ function torbutton_prefs_reset_defaults() { } function torbutton_toggle_slider(doc, pos) { - let slider = doc.getElementById("torbutton_sec_slider"); - // onclick is active even if the element it belongs to is disabled. - if (pos && !slider.disabled) { - slider.value = pos; - } else { - if (doc.getElementById("torbutton_sec_custom").checked) { - slider.disabled = true; - slider.setAttribute("movetoclick", false); - } else { - slider.disabled = false; - slider.setAttribute("movetoclick", true); - } + doc.getElementById("torbutton_sec_slider").value = pos; + // Make sure the custom checkbox is unchecked as the user seems to want one + // of the defined security levels. + let sec_custom = doc.getElementById("torbutton_sec_custom"); + if (sec_custom.checked) { + sec_custom.checked = false; } } diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index cb5f1ab..57b013a 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -188,7 +188,6 @@ </hbox> <hbox> <checkbox id="torbutton_sec_custom" flex="1" - oncommand="torbutton_toggle_slider(document, 0);" label="&torbutton.prefs.sec_custom;"/> </hbox> </groupbox>

1 0

[torbutton/master] Merge remote-tracking branch 'brade/bug13406-01'
by mikeperry＠torproject.org 10 Feb '15

10 Feb '15

commit 0ac77f28bed415b27942d5264b0e5037fb57c2a1 Merge: a717611 2ccb9cb Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Feb 9 14:51:05 2015 -0800 Merge remote-tracking branch 'brade/bug13406-01' src/chrome/content/popup.xul | 7 +++---- src/chrome/content/torbutton.js | 30 +++++++++--------------------- src/chrome/locale/en/aboutTor.dtd | 4 ++-- src/chrome/locale/en/torbutton.dtd | 2 +- src/chrome/skin/torbutton.css | 4 ++-- 5 files changed, 17 insertions(+), 30 deletions(-)

1 0

[tor-browser-bundle/master] Bug 14526: Merge of #8405 breaks nightly builds
by gk＠torproject.org 30 Jan '15

30 Jan '15

commit ad82b1ef6f99a8468e6e02c0977546a23bd0149c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 30 11:27:17 2015 +0000 Bug 14526: Merge of #8405 breaks nightly builds --- gitian/descriptors/linux/gitian-tor.yml | 3 ++- gitian/descriptors/mac/gitian-tor.yml | 3 ++- gitian/descriptors/windows/gitian-tor.yml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index f9795ea..87f3f10 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -80,7 +80,8 @@ script: | then git am ~/build/bug8405.patch git am ~/build/bug8402-master.patch - else # 0.2.6 and master + elif [ ${TOR_TAG::9} == "tor-0.2.6" ]; + then git am ~/build/bug8405.patch fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 9cedf67..a772a74 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -58,7 +58,8 @@ script: | then git am ~/build/bug8405.patch git am ~/build/bug8402-master.patch - else # 0.2.6 and master + elif [ ${TOR_TAG::9} == "tor-0.2.6" ]; + then git am ~/build/bug8405.patch fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index dce98f8..9cbbb86 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -58,7 +58,8 @@ script: | then git am ~/build/bug8405.patch git am ~/build/bug8402-master.patch - else # 0.2.6 and master + elif [ ${TOR_TAG::9} == "tor-0.2.6" ]; + then git am ~/build/bug8405.patch fi mkdir -p $OUTDIR/src

1 0

[tor-browser-bundle/master] Bump NoScript version in nightlies
by gk＠torproject.org 30 Jan '15

30 Jan '15

commit ab91d616e7eb015b1ca54e3130be85c302963d09 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 30 09:21:35 2015 +0000 Bump NoScript version in nightlies --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 4be76d8..16519f5 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -61,7 +61,7 @@ GO_VER=1.3.3 ## 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.10-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.11-sm+fn+fx.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.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 @@ -91,7 +91,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=e1670ebc03810f82f61179fa158085df86b8f2a01d63ea16fa3f031242e4ec42 +NOSCRIPT_HASH=568122b4834baf2113648317baf294879700178df157780a9c89582280338ba8 HTTPSE_HASH=a42812dbd4b0103600ac5dce0e5f1366e8a7a7267e18743f5cd1e152615964e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'linus/stupid-sender-bug'
by gk＠torproject.org 28 Jan '15

28 Jan '15

commit 437e1beec2207dca79c2917b55b6f3a468150d7f Merge: e64e8d5 cb71808 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 28 14:12:22 2015 +0000 Merge remote-tracking branch 'linus/stupid-sender-bug' tools/continuous-builds/build-tbb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser-bundle/master] Fix stupid LOGSENDER bug.
by gk＠torproject.org 28 Jan '15

28 Jan '15

commit cb718087cb08049ea3f672ac0461d7a1055ed267 Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Jan 28 14:07:26 2015 +0100 Fix stupid LOGSENDER bug. --- tools/continuous-builds/build-tbb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index 271f1ec..434d61b 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -73,6 +73,6 @@ else ../../gitian-builder/var/build.log \ ../../gitian-builder/var/target.log" tail -n 50 $FILES | $MAILX -E -s "Nightly build failure -- $(date +%F)" \ - $sender -- $LOGRECIPIENTS + $LOGSENDER -- $LOGRECIPIENTS fi fi

1 0