- tbb-commits - lists.torproject.org

[torbutton/maint-1.9.7] fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog.
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 61aaf90a94efd737213e31405f77965dd36001cd Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 30 12:06:24 2017 -0400 fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog. Improve the overview/summary comment in external-app-blocker.js. --- src/components/external-app-blocker.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js index ca86580..1f88fc7 100644 --- a/src/components/external-app-blocker.js +++ b/src/components/external-app-blocker.js @@ -8,9 +8,8 @@ * due to Firefox Bug https://bugzilla.mozilla.org/show_bug.cgi?id=440892 * * An instance of this module is created each time the browser starts to - * download a file that may be opened by another or application and when - * an external application may be invoked to handle an URL (e.g., when the - * user clicks on a mailto: URL). + * download a file and when an external application may be invoked to + * handle an URL (e.g., when the user clicks on a mailto: URL). *************************************************************************/ const Cc = Components.classes;

1 0

[torbutton/master] Bug 23887: Update banner locales and Mozilla text
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 235da9c962e5e2b06ed7c73259d51d723433b5f0 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Oct 16 23:09:56 2017 -0700 Bug 23887: Update banner locales and Mozilla text Also: change donation link to https://www.torproject.org/donate/donate-pdr-tbb-[locale] --- src/chrome/content/aboutTor/aboutTor.xhtml | 3 ++- src/chrome/content/aboutTor/donation_banner.js | 4 +++- src/chrome/skin/donation_banner.css | 23 ++++++++++++++++++++--- src/modules/donation-banner.js | 16 ++++++++++------ 4 files changed, 35 insertions(+), 11 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 367f9a6..248df11 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -37,8 +37,9 @@ window.addEventListener("pageshow", function() { <div id="banner-contents-container"> <div id="banner-tagline"><span></span></div> <div id="banner-slogan"><span></span></div> + <div id="banner-mozilla"><span></span></div> <a id="banner-donate-button-link" - href="https://www.torproject.org/donate/donate-tbb"> + href="https://www.torproject.org/donate/donate-pdr-tbb"> <div id="banner-donate-button"> <div id="banner-donate-button-inner"> <span></span> diff --git a/src/chrome/content/aboutTor/donation_banner.js b/src/chrome/content/aboutTor/donation_banner.js index 1c95822..391c28f 100644 --- a/src/chrome/content/aboutTor/donation_banner.js +++ b/src/chrome/content/aboutTor/donation_banner.js @@ -46,6 +46,7 @@ let avoidWidows = function (element) { let updateTextSizes = function () { fitTextInElement(sel("#banner-tagline")); fitTextInElement(sel("#banner-slogan")); + fitTextInElement(sel("#banner-mozilla")); fitTextInElement(sel("#banner-donate-button-inner")); avoidWidows(sel("#banner-tagline span")); }; @@ -54,10 +55,11 @@ let updateTextSizes = function () { let randomInteger = max => Math.floor(max * Math.random()); // The main donation banner function. -let runDonationBanner = function ({ taglines, slogan, donate, shortLocale }) { +let runDonationBanner = function ({ taglines, slogan, mozilla, donate, shortLocale }) { try { sel("#banner-tagline span").innerText = taglines[randomInteger(taglines.length)]; sel("#banner-slogan span").innerText = slogan; + sel("#banner-mozilla span").innerText = mozilla; let donateButtonText = sel("#banner-donate-button-inner span"); let rtl = window.getComputedStyle(donateButtonText).direction === "rtl"; donateButtonText.innerHTML = donate + " " + (rtl ? "◀" : "▶"); diff --git a/src/chrome/skin/donation_banner.css b/src/chrome/skin/donation_banner.css index 8580066..c91f0e5 100644 --- a/src/chrome/skin/donation_banner.css +++ b/src/chrome/skin/donation_banner.css @@ -58,8 +58,8 @@ right: 85px; } #banner-slogan { - align-items: start; - bottom: 0px; + align-items: center; + bottom: 30px; color: #f8f8a0; display: flex; font-family: monospace; @@ -68,13 +68,30 @@ position: absolute; right: 285px; text-align: start; - top: 100px; + top: 90px; white-space: nowrap; } #banner-slogan:-moz-dir(rtl) { left: 285px; right: 85px; } +#banner-mozilla { + align-items: center; + bottom: 5px; + color: white; + display: flex; + font-family: sans-serif; + left: 85px; + position: absolute; + right: 285px; + text-align: start; + top: 120px; + white-space: nowrap; +} +#banner-mozilla:-moz-dir(rtl) { + left: 285px; + right: 85px; +} #banner-donate-button { background-color: #13a513; border: 0px; diff --git a/src/modules/donation-banner.js b/src/modules/donation-banner.js index bb35e86..3a954e5 100644 --- a/src/modules/donation-banner.js +++ b/src/modules/donation-banner.js @@ -9,14 +9,17 @@ Cu.import("resource://gre/modules/Services.jsm"); const kBannerLocales = [ "bg", "da", + "de", "el", "en", "es", "fr", - "fr_CA", "is", "it", + "pt", "nb", + "ru", + "sv", "tr", ]; @@ -46,7 +49,7 @@ const gStringBundle = Services.strings.createBundle(kPropertiesURL); // Check if we should show the banner, depends on // browser locale, current date, and how many times // we have already shown the banner. -const shouldShowBanner = function ({ locale, shortLocale }) { +const shouldShowBanner = function (shortLocale) { try { // If our override test pref is true, then just show the banner regardless. if (Services.prefs.getBoolPref("extensions.torbutton.testBanner", false)) { @@ -58,7 +61,7 @@ const shouldShowBanner = function ({ locale, shortLocale }) { return false; } // Only show banner when we have that locale and if a donation redirect exists. - if (kBannerLocales.indexOf(locale) === -1 || + if (kBannerLocales.indexOf(shortLocale) === -1 || kDonationPageLocales.indexOf(shortLocale) === -1) { return false; } @@ -92,7 +95,7 @@ var bannerData = function () { // Read short locale. let locale = Services.prefs.getCharPref("general.useragent.locale"); let shortLocale = locale.match(/[a-zA-Z]+/)[0].toLowerCase(); - if (!shouldShowBanner({ locale, shortLocale })) { + if (!shouldShowBanner(shortLocale)) { return null; } // Load tag lines. @@ -102,10 +105,11 @@ var bannerData = function () { "aboutTor.donationBanner.tagline" + (index + 1)); taglines.push(tagline); } - // Read slogan and donate button text. + // Read slogan, mozilla, and donate button text. let slogan = gStringBundle.GetStringFromName("aboutTor.donationBanner.slogan"); + let mozilla = gStringBundle.GetStringFromName("aboutTor.donationBanner.mozilla"); let donate = gStringBundle.GetStringFromName("aboutTor.donationBanner.donate"); - return JSON.stringify({ taglines, slogan, donate, shortLocale }); + return JSON.stringify({ taglines, slogan, mozilla, donate, shortLocale }); }; // Export utility functions for external use.

1 0

[torbutton/master] Translations update
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 4f33131f3e1b110511d594e68b42757a84c1b4fe Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 17 11:15:10 2017 +0000 Translations update --- src/chrome/content/torbutton.js | 2 +- src/chrome/locale/de/aboutTor.properties | 16 ++++++++-------- src/chrome/locale/es/aboutTor.properties | 2 +- src/chrome/locale/fr/aboutTor.properties | 2 +- src/chrome/locale/it/aboutTor.properties | 8 ++++---- src/chrome/locale/nl/aboutTor.properties | 8 ++++---- src/chrome/locale/pl/aboutTor.properties | 16 ++++++++-------- src/chrome/locale/pt-BR/aboutTor.properties | 2 +- src/chrome/locale/ru/aboutTor.properties | 10 +++++----- src/chrome/locale/ru/torbutton.dtd | 4 ++-- src/chrome/locale/sv/aboutTor.properties | 16 ++++++++-------- src/chrome/locale/tr/aboutTor.properties | 2 +- 12 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 955f8eb..9e18adb 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2346,7 +2346,7 @@ function torbutton_update_noscript_button() // Update every window's NoScript status... while (browserEnumerator.hasMoreElements()) { let win = browserEnumerator.getNext(); - win.noscriptOverlay._syncUINow(); + //win.noscriptOverlay._syncUINow(); } torbutton_log(3, 'Updated NoScript status for security settings'); } catch (e) { diff --git a/src/chrome/locale/de/aboutTor.properties b/src/chrome/locale/de/aboutTor.properties index 3233797..9d2b0df 100644 --- a/src/chrome/locale/de/aboutTor.properties +++ b/src/chrome/locale/de/aboutTor.properties @@ -8,13 +8,13 @@ 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.donationBanner.donate=Donate Now! +aboutTor.donationBanner.donate=Jetzt spenden! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance -aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! +aboutTor.donationBanner.slogan=Tor: Digitalen Widerstand stärken +aboutTor.donationBanner.mozilla=Spenden Sie heute und Mozilla wird Ihr Geschenk anpassen -aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide -aboutTor.donationBanner.tagline3=Freedom Online -aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide -aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day +aboutTor.donationBanner.tagline1=Schützt seit 2006 Journalisten, Whistleblower & Aktivisten +aboutTor.donationBanner.tagline2=Weltweite Vernetzungsfreiheit +aboutTor.donationBanner.tagline3=Freiheit online +aboutTor.donationBanner.tagline4=Fördert weltweit freie Meinungsäußerung. +aboutTor.donationBanner.tagline5=Schützt täglich die Privatsphäre von Millionen. diff --git a/src/chrome/locale/es/aboutTor.properties b/src/chrome/locale/es/aboutTor.properties index 01cd311..f1e2d59 100644 --- a/src/chrome/locale/es/aboutTor.properties +++ b/src/chrome/locale/es/aboutTor.properties @@ -10,7 +10,7 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/?kl=-es aboutTor.donationBanner.donate=¡Dona ahora! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.slogan=Tor: Impulsando la resistencia digital aboutTor.donationBanner.mozilla=¡Dona hoy y Mozilla te la igualará! aboutTor.donationBanner.tagline1=Protegiendo a periodistas, informantes, y activistas desde 2006 diff --git a/src/chrome/locale/fr/aboutTor.properties b/src/chrome/locale/fr/aboutTor.properties index bdaedb7..cd844af 100644 --- a/src/chrome/locale/fr/aboutTor.properties +++ b/src/chrome/locale/fr/aboutTor.properties @@ -10,7 +10,7 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=Faites un don maintenant ! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.slogan=Tor : la puissance de la résistance numérique aboutTor.donationBanner.mozilla=Faites un don aujourd'hui et Mozilla fera un don équivalent ! aboutTor.donationBanner.tagline1=Nous protégeons journalistes, lanceurs d'alerte et activistes depuis 2006 diff --git a/src/chrome/locale/it/aboutTor.properties b/src/chrome/locale/it/aboutTor.properties index 8d5b3a7..e25f90a 100644 --- a/src/chrome/locale/it/aboutTor.properties +++ b/src/chrome/locale/it/aboutTor.properties @@ -10,11 +10,11 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=Dona adesso! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance -aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! +aboutTor.donationBanner.slogan=Tor: alimentiamo la resistenza digitale +aboutTor.donationBanner.mozilla=Dona oggi e Mozilla ricambierà il regalo! aboutTor.donationBanner.tagline1=Proteggiamo giornalisti, informatori e attivisti dal 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide +aboutTor.donationBanner.tagline2=Rendiamo la rete libera nel mondo aboutTor.donationBanner.tagline3=Libertà online -aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline4=Promuoviamo la libertà di parola nel mondo aboutTor.donationBanner.tagline5=Proteggiamo la privacy di milioni di persone ogni giorno diff --git a/src/chrome/locale/nl/aboutTor.properties b/src/chrome/locale/nl/aboutTor.properties index ee9cc49..521f96f 100644 --- a/src/chrome/locale/nl/aboutTor.properties +++ b/src/chrome/locale/nl/aboutTor.properties @@ -8,13 +8,13 @@ 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.donationBanner.donate=Donate Now! +aboutTor.donationBanner.donate=Doneer nu! aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide -aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline2=Wereldwijde Netwerk Vrijheid +aboutTor.donationBanner.tagline3=Online Vrijheid aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide -aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day +aboutTor.donationBanner.tagline5=Beveiligt de privacy van miljoenen gebruikers per dag diff --git a/src/chrome/locale/pl/aboutTor.properties b/src/chrome/locale/pl/aboutTor.properties index dc12b3a..b6e1bba 100644 --- a/src/chrome/locale/pl/aboutTor.properties +++ b/src/chrome/locale/pl/aboutTor.properties @@ -8,13 +8,13 @@ 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.donationBanner.donate=Donate Now! +aboutTor.donationBanner.donate=Wesprzyj teraz! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance -aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! +aboutTor.donationBanner.slogan=Tor: Zasila Odporność Cyfrową +aboutTor.donationBanner.mozilla=Daj dzisiaj i Mozilla dopasuje Twój prezent! -aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide -aboutTor.donationBanner.tagline3=Freedom Online -aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide -aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day +aboutTor.donationBanner.tagline1=Chroni dziennikarzy, informatorów i aktywistów od 2006 +aboutTor.donationBanner.tagline2=Wolność dla sieci na całym świecie +aboutTor.donationBanner.tagline3=Wolność Online +aboutTor.donationBanner.tagline4=Wspieranie ekspresji na całym świecie +aboutTor.donationBanner.tagline5=Ochrona prywatności milionów każdego dnia diff --git a/src/chrome/locale/pt-BR/aboutTor.properties b/src/chrome/locale/pt-BR/aboutTor.properties index 84a283a..ca749aa 100644 --- a/src/chrome/locale/pt-BR/aboutTor.properties +++ b/src/chrome/locale/pt-BR/aboutTor.properties @@ -10,7 +10,7 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=Faça uma Doação Agora! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.slogan=Tor: Desligando a Resistência Digital aboutTor.donationBanner.mozilla=Faça uma doação hoje e a Mozilla vai doará em dobro! aboutTor.donationBanner.tagline1=Protegendo Jornalistas, Whistleblowers e Ativistas desde 2006 diff --git a/src/chrome/locale/ru/aboutTor.properties b/src/chrome/locale/ru/aboutTor.properties index 695436a..527d579 100644 --- a/src/chrome/locale/ru/aboutTor.properties +++ b/src/chrome/locale/ru/aboutTor.properties @@ -8,13 +8,13 @@ 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.donationBanner.donate=Donate Now! +aboutTor.donationBanner.donate=Пожертвовать! aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! -aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide -aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline1=Защита журналистов, информаторов и активистов с 2006 года +aboutTor.donationBanner.tagline2=Свобода сети во всём мире +aboutTor.donationBanner.tagline3=Свобода в сети aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide -aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day +aboutTor.donationBanner.tagline5=Защита конфиденциальности миллионов каждый день diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index 839bfca..fb05620 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -27,10 +27,10 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Не защищать новые куки-файлы"> <!ENTITY torbutton.prefs.restrict_thirdparty "Блокировать сторонние куки-файлы и другие данные слежения"> <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> -<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Оставьте флажок напротив этой опции отмеченным, чтобы защитить многие функции обозревателя от элементов отслеживания ваших действий во время серфинга в сети. Модифицированные компоненты включают в себя ссылки на блобы, транслируемые каналы, кэш браузера, файлы куки, значки, заголовки аутентификации HTTP, ссылки предпросмотра, локальное хранилище, ссылки на медиаконтент, запросы OCSP, SharedWorkers и объявления сессии TLS."> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Оставьте флажок напротив этой функции отмеченным, чтобы защитить многие функции обозревателя от элементов отслеживания ваших действий во время серфинга в сети. Модифицированные компоненты включают в себя ссылки на блобы, транслируемые каналы, кэш браузера, файлы куки, значки, заголовки аутентификации HTTP, ссылки предпросмотра, локальное хранилище, ссылки на медиаконтент, запросы OCSP, SharedWorkers и объявления сессии TLS."> <!ENTITY torbutton.prefs.resist_fingerprinting "Изменить сведения, отличающие вас от других пользователей Tor Browser"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Оставьте флажок напротив этой функции отмеченным, чтобы скрыть от веб-узлов вещи , которые могут быть уникальными для вас, включая производительность компьютера, раскладку клавиатуры, язык, расположение и список установленных плагинов, состояние сети, ориентацию и размер экрана , значения масштабирования для конкретных узлов, поддерживаемые типы файлов, системные цвета и возможности WebGL."> <!ENTITY torbutton.prefs.sec_caption "Уровень безопасности"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Ползунок безопасности позволяет вам запретить некоторые особенности обозревателя, которые могут сделать ваш браузер более уязвимым к попыткам взлома."> <!ENTITY torbutton.prefs.sec_low "Низкий (по умолчанию)"> diff --git a/src/chrome/locale/sv/aboutTor.properties b/src/chrome/locale/sv/aboutTor.properties index 64b0ed9..016ea20 100644 --- a/src/chrome/locale/sv/aboutTor.properties +++ b/src/chrome/locale/sv/aboutTor.properties @@ -8,13 +8,13 @@ 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.donationBanner.donate=Donate Now! +aboutTor.donationBanner.donate=Donera nu! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance -aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! +aboutTor.donationBanner.slogan=Tor: Kraftfull digital resistans +aboutTor.donationBanner.mozilla=Ge idag och Mozilla kommer att matcha din gåva! -aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide -aboutTor.donationBanner.tagline3=Freedom Online -aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide -aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day +aboutTor.donationBanner.tagline1=Skyddar journalister, whistleblowers och aktivister sedan 2006 +aboutTor.donationBanner.tagline2=Nätverksfrihet över hela världen +aboutTor.donationBanner.tagline3=Frihet på nåtet +aboutTor.donationBanner.tagline4=Främja yttrandefriheten över hela världen +aboutTor.donationBanner.tagline5=Skydda integriteten av miljoner varje dag diff --git a/src/chrome/locale/tr/aboutTor.properties b/src/chrome/locale/tr/aboutTor.properties index 3b7a7d6..e07e35d 100644 --- a/src/chrome/locale/tr/aboutTor.properties +++ b/src/chrome/locale/tr/aboutTor.properties @@ -10,7 +10,7 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=Bağış Yapın -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.slogan=Tor: Dijital Direnişi Güçlendiriyor aboutTor.donationBanner.mozilla=Destek olun ve Mozilla tarafından hediyenizin karşılığını alın! aboutTor.donationBanner.tagline1=2006 Yılından Beri Gazeteciler, Yolsuzlukları Açıklayanlar ve Aktivistler Korunuyor

1 0

[tor-browser/tor-browser-52.4.0esr-7.5-1] Revert "bug 23104 - Add a default line height compensation"
by gk＠torproject.org 05 Oct '17

05 Oct '17

commit 5117adf6b06bd2901144d15847b4cc902a94741a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 5 12:08:28 2017 +0000 Revert "bug 23104 - Add a default line height compensation" This reverts commit 722fd293451de0859106949d64dc2cb16c22a780. Backing out due to #23701: We should make sure this defense only applies to content and not the browser chrome. --- layout/generic/ReflowInput.cpp | 6 ----- tbb-tests/mochitest.ini | 1 - tbb-tests/test_tor_bug23104.html | 51 ---------------------------------------- 3 files changed, 58 deletions(-) diff --git a/layout/generic/ReflowInput.cpp b/layout/generic/ReflowInput.cpp index e219ae032cc6..42f4a24b5314 100644 --- a/layout/generic/ReflowInput.cpp +++ b/layout/generic/ReflowInput.cpp @@ -30,7 +30,6 @@ #include "CounterStyleManager.h" #include <algorithm> #include "mozilla/dom/HTMLInputElement.h" -#include "nsContentUtils.h" #ifdef DEBUG #undef NOISY_VERTICAL_ALIGN @@ -2769,11 +2768,6 @@ GetNormalLineHeight(nsFontMetrics* aFontMetrics) nscoord externalLeading = aFontMetrics->ExternalLeading(); nscoord internalLeading = aFontMetrics->InternalLeading(); nscoord emHeight = aFontMetrics->EmHeight(); - - if (nsContentUtils::ShouldResistFingerprinting()) { - return NSToCoordRound(emHeight * NORMAL_LINE_HEIGHT_FACTOR); - } - switch (GetNormalLineHeightCalcControl()) { case eIncludeExternalLeading: normalLineHeight = emHeight+ internalLeading + externalLeading; diff --git a/tbb-tests/mochitest.ini b/tbb-tests/mochitest.ini index fca972a51211..3d2e7c9db803 100644 --- a/tbb-tests/mochitest.ini +++ b/tbb-tests/mochitest.ini @@ -10,4 +10,3 @@ support-files = [test_tor_bug2875.html] [test_tor_bug4755.html] [test_tor_bug5856.html] -[test_tor_bug23104.html] diff --git a/tbb-tests/test_tor_bug23104.html b/tbb-tests/test_tor_bug23104.html deleted file mode 100644 index 77d7d190d7c8..000000000000 --- a/tbb-tests/test_tor_bug23104.html +++ /dev/null @@ -1,51 +0,0 @@ -<!DOCTYPE HTML> -<meta charset="UTF-8"> -<html> -<head> - <title>Test for Tor Bug #23104: CSS line-height reveals the platform Tor browser is running</title> - <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> - <script type="application/javascript" src="/tests/SimpleTest/SpawnTask.js"></script> - <style type="text/css"> - span { - background-color: #000; - color: #fff; - font-size: 16.5px; - } - </style> -</head> -<body> -<span id="test1">Test1</span> -<span id="test2">كلمة</span> -<span id="test3">ação</span> -<script type="application/javascript;version=1.7"> - -let setPref = function* (key, value) { - return new Promise(function(resolve, reject) { - SpecialPowers.pushPrefEnv({"set": [[key, value]]}, resolve); - }); -} - -function getStyle(el, styleprop) { - el = document.getElementById(el); - return document.defaultView.getComputedStyle(el, null).getPropertyValue(styleprop); -} - -function validateElement(elementName, isFingerprintResistent) { - var fontSize = getStyle(elementName, 'font-size'); - var lineHeight = getStyle(elementName, 'line-height'); - var validationCb = isFingerprintResistent ? is : isnot; - validationCb(parseFloat(lineHeight), Math.ceil(parseFloat(fontSize)) * 1.2, 'Line Height validation'); -} - -add_task(function* () { - for (let resistFingerprintingValue of [true, false]) { - yield setPref("privacy.resistFingerprinting", resistFingerprintingValue); - for (let elementId of ['test1', 'test2', 'test3']) { - validateElement(elementId, resistFingerprintingValue); - } - } -}); - -</script> -</body> -</html>

1 0

[tor-browser-build/master] Bug 23585: fix build with runc version 1.0.0~rc2
by gk＠torproject.org 05 Oct '17

05 Oct '17

commit 8c4c05ddcfc30107b967b204d491523685460226 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Sep 19 20:31:22 2017 +0200 Bug 23585: fix build with runc version 1.0.0~rc2 Some distributions are packaging runc version 1.0.0~rc2, which seems to be half between runc 0.1.1 and runc 1.0.0. This version requires the same command line parameters as version 1.0.0, however it requires a config.json in the same format as 0.1.1. The output from `runc --version` on 1.0.0~rc2 is: runc version spec: 1.0.0-rc2-dev So we add a var/runc_spec100 function which is true when the runc version spec is exactly 1.0.0 (as returned by runc stable 1.0.x releases), and use it in projects/common/runc-config.json. --- projects/common/runc-config.json | 6 +++--- rbm.conf | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/projects/common/runc-config.json b/projects/common/runc-config.json index a4386c6..7a88805 100644 --- a/projects/common/runc-config.json +++ b/projects/common/runc-config.json @@ -1,5 +1,5 @@ { - "ociVersion": "1.0.0[% IF !c("var_p/runc100") %]-rc1[% END %]", + "ociVersion": "1.0.0[% IF !c("var_p/runc_spec100") %]-rc1[% END %]", "platform": { "os": "linux", [% IF c("var/container/arch") == 'i386' -%] @@ -22,7 +22,7 @@ "TERM=xterm" ], "cwd": "/", -[% IF c("var_p/runc100") -%] +[% IF c("var_p/runc_spec100") -%] "capabilities": { "bounding": [ "CAP_AUDIT_WRITE", @@ -250,7 +250,7 @@ "/proc/kcore", "/proc/latency_stats", "/proc/timer_stats", -[% IF c("var_p/runc100") -%] +[% IF c("var_p/runc_spec100") -%] "/proc/timer_list", "/sys/firmware", [% END -%] diff --git a/rbm.conf b/rbm.conf index 0b0193d..c433f00 100644 --- a/rbm.conf +++ b/rbm.conf @@ -379,5 +379,11 @@ ENV: my ($out) = capture_exec('sudo', 'runc', '--version'); return !($out =~ m/^runc version 0.1.1/); }, + # runc_spec100 is true if runc spec is exactly 1.0.0 + # We will need to update this when there is a new spec version available + runc_spec100 => sub { + my ($out) = capture_exec('sudo', 'runc', '--version'); + return $out =~ m/^runc version spec: 1\.0\.0$/; + }, }, )

1 0

[tor-browser/tor-browser-52.4.0esr-7.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 04 Oct '17

04 Oct '17

commit b1c4718f8907e2ecae4d47e3ca83ba5077974e5b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 28 13:59:13 2017 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 16c23be0d65a..444c9f39b02a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -180,13 +180,13 @@ pref("dom.maxHardwareConcurrency", 1); // Bug 21675: Spoof single-core cpu pref("dom.w3c_touch_events.enabled", 0); // Bug 10286: Always disable Touch API // Third party stuff +pref("privacy.firstparty.isolate", true); // Always enforce first party isolation pref("network.cookie.cookieBehavior", 1); pref("security.enable_tls_session_tickets", false); pref("network.http.spdy.enabled", false); // Stores state and may have keepalive issues (both fixable) pref("network.http.spdy.enabled.v2", false); // Seems redundant, but just in case pref("network.http.spdy.enabled.v3", false); // Seems redundant, but just in case pref("network.http.spdy.enabled.v3-1", false); // Seems redundant, but just in case -pref("privacy.firstparty.isolate", true); // Always enforce first party isolation pref("network.http.spdy.enabled.http2", false); // Temporarily disabled pending implementation review pref("network.http.spdy.enabled.http2draft", false); // Temporarily disabled pending implementation review pref("network.predictor.enabled", false); // Temporarily disabled. See https://bugs.torproject.org/16633

1 0

[tor-browser/tor-browser-52.4.0esr-7.5-1] Bug 13398: at startup, browser gleans user FULL NAME (real name, given name) from O/S
by gk＠torproject.org 04 Oct '17

04 Oct '17

commit e3b99866dbdc29a2949d0a53806b99a94f34cc73 Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Sep 29 15:35:31 2017 -0700 Bug 13398: at startup, browser gleans user FULL NAME (real name, given name) from O/S ifdef'd out offending code in each platform based on existance of TOR_BROWSER_VERSION and return empty string instead. --- toolkit/components/startup/nsUserInfoMac.mm | 24 ++++++++++++++++++++---- toolkit/components/startup/nsUserInfoUnix.cpp | 20 ++++++++++++++++++++ toolkit/components/startup/nsUserInfoWin.cpp | 22 ++++++++++++++++++++-- 3 files changed, 60 insertions(+), 6 deletions(-) diff --git a/toolkit/components/startup/nsUserInfoMac.mm b/toolkit/components/startup/nsUserInfoMac.mm index 1895cf177353..175e9637c422 100644 --- a/toolkit/components/startup/nsUserInfoMac.mm +++ b/toolkit/components/startup/nsUserInfoMac.mm @@ -19,11 +19,14 @@ NS_IMETHODIMP nsUserInfo::GetFullname(char16_t **aFullname) { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT - +#ifndef TOR_BROWSER_VERSION NS_ConvertUTF8toUTF16 fullName([NSFullUserName() UTF8String]); *aFullname = ToNewUnicode(fullName); return NS_OK; - +#else + *aFullname = ToNewUnicode(NS_LITERAL_STRING("")); + return *aFullname ? NS_OK : NS_ERROR_FAILURE; +#endif NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT } @@ -31,11 +34,14 @@ NS_IMETHODIMP nsUserInfo::GetUsername(char **aUsername) { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT - +#ifndef TOR_BROWSER_VERSION nsAutoCString username([NSUserName() UTF8String]); *aUsername = ToNewCString(username); return NS_OK; - +#else + *aUsername = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aUsername ? NS_OK : NS_ERROR_FAILURE; +#endif NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT } @@ -63,15 +69,21 @@ nsUserInfo::GetPrimaryEmailAddress(nsCString &aEmailAddress) NS_IMETHODIMP nsUserInfo::GetEmailAddress(char **aEmailAddress) { +#ifndef TOR_BROWSER_VERSION nsAutoCString email; if (NS_SUCCEEDED(GetPrimaryEmailAddress(email))) *aEmailAddress = ToNewCString(email); return NS_OK; +#else + *aEmailAddress = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aEmailAddress ? NS_OK : NS_ERROR_FAILURE; +#endif } NS_IMETHODIMP nsUserInfo::GetDomain(char **aDomain) { +#ifndef TOR_BROWSER_VERSION nsAutoCString email; if (NS_SUCCEEDED(GetPrimaryEmailAddress(email))) { int32_t index = email.FindChar('@'); @@ -81,4 +93,8 @@ nsUserInfo::GetDomain(char **aDomain) } } return NS_OK; +#else + *aDomain = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aDomain ? NS_OK : NS_ERROR_FAILURE; +#endif } diff --git a/toolkit/components/startup/nsUserInfoUnix.cpp b/toolkit/components/startup/nsUserInfoUnix.cpp index 71bc46da2573..6c8b35443139 100644 --- a/toolkit/components/startup/nsUserInfoUnix.cpp +++ b/toolkit/components/startup/nsUserInfoUnix.cpp @@ -36,6 +36,7 @@ NS_IMPL_ISUPPORTS(nsUserInfo,nsIUserInfo) NS_IMETHODIMP nsUserInfo::GetFullname(char16_t **aFullname) { +#ifndef TOR_BROWSER_VERSION struct passwd *pw = nullptr; pw = getpwuid (geteuid()); @@ -76,11 +77,16 @@ nsUserInfo::GetFullname(char16_t **aFullname) return NS_OK; return NS_ERROR_FAILURE; +#else + *aFullname = ToNewUnicode(NS_LITERAL_STRING("")); + return *aFullname ? NS_OK : NS_ERROR_FAILURE; +#endif } NS_IMETHODIMP nsUserInfo::GetUsername(char * *aUsername) { +#ifndef TOR_BROWSER_VERSION struct passwd *pw = nullptr; // is this portable? those are POSIX compliant calls, but I need to check @@ -95,11 +101,16 @@ nsUserInfo::GetUsername(char * *aUsername) *aUsername = strdup(pw->pw_name); return NS_OK; +#else + *aUsername = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aUsername ? NS_OK : NS_ERROR_FAILURE; +#endif } NS_IMETHODIMP nsUserInfo::GetDomain(char * *aDomain) { +#ifndef TOR_BROWSER_VERSION nsresult rv = NS_ERROR_FAILURE; struct utsname buf; @@ -132,11 +143,16 @@ nsUserInfo::GetDomain(char * *aDomain) } return rv; +#else + *aDomain = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aDomain ? NS_OK : NS_ERROR_FAILURE; +#endif } NS_IMETHODIMP nsUserInfo::GetEmailAddress(char * *aEmailAddress) { +#ifndef TOR_BROWSER_VERSION // use username + "@" + domain for the email address nsresult rv; @@ -163,5 +179,9 @@ nsUserInfo::GetEmailAddress(char * *aEmailAddress) *aEmailAddress = ToNewCString(emailAddress); return NS_OK; +#else + *aEmailAddress = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aEmailAddress ? NS_OK : NS_ERROR_FAILURE; +#endif } diff --git a/toolkit/components/startup/nsUserInfoWin.cpp b/toolkit/components/startup/nsUserInfoWin.cpp index b27a2c483b1c..04552d7310f9 100644 --- a/toolkit/components/startup/nsUserInfoWin.cpp +++ b/toolkit/components/startup/nsUserInfoWin.cpp @@ -30,6 +30,7 @@ nsUserInfo::GetUsername(char **aUsername) { NS_ENSURE_ARG_POINTER(aUsername); *aUsername = nullptr; +#ifndef TOR_BROWSER_VERSION // ULEN is the max username length as defined in lmcons.h wchar_t username[UNLEN +1]; @@ -39,6 +40,10 @@ nsUserInfo::GetUsername(char **aUsername) *aUsername = ToNewUTF8String(nsDependentString(username)); return (*aUsername) ? NS_OK : NS_ERROR_FAILURE; +#else + *aUsername = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aUsername ? NS_OK : NS_ERROR_FAILURE; +#endif } NS_IMETHODIMP @@ -46,6 +51,7 @@ nsUserInfo::GetFullname(char16_t **aFullname) { NS_ENSURE_ARG_POINTER(aFullname); *aFullname = nullptr; +#ifndef TOR_BROWSER_VERSION wchar_t fullName[512]; DWORD size = mozilla::ArrayLength(fullName); @@ -91,6 +97,10 @@ nsUserInfo::GetFullname(char16_t **aFullname) } return (*aFullname) ? NS_OK : NS_ERROR_FAILURE; +#else + *aFullname = ToNewUnicode(NS_LITERAL_STRING("")); + return *aFullname ? NS_OK : NS_ERROR_FAILURE; +#endif } NS_IMETHODIMP @@ -98,7 +108,7 @@ nsUserInfo::GetDomain(char **aDomain) { NS_ENSURE_ARG_POINTER(aDomain); *aDomain = nullptr; - +#ifndef TOR_BROWSER_VERSION const DWORD level = 100; LPBYTE info; NET_API_STATUS status = NetWkstaGetInfo(nullptr, level, &info); @@ -110,6 +120,10 @@ nsUserInfo::GetDomain(char **aDomain) } return (*aDomain) ? NS_OK : NS_ERROR_FAILURE; +#else + *aDomain = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aDomain ? NS_OK : NS_ERROR_FAILURE; +#endif } NS_IMETHODIMP @@ -117,7 +131,7 @@ nsUserInfo::GetEmailAddress(char **aEmailAddress) { NS_ENSURE_ARG_POINTER(aEmailAddress); *aEmailAddress = nullptr; - +#ifndef TOR_BROWSER_VERSION // RFC3696 says max length of an email address is 254 wchar_t emailAddress[255]; DWORD size = mozilla::ArrayLength(emailAddress); @@ -130,4 +144,8 @@ nsUserInfo::GetEmailAddress(char **aEmailAddress) *aEmailAddress = ToNewUTF8String(nsDependentString(emailAddress)); return (*aEmailAddress) ? NS_OK : NS_ERROR_FAILURE; +#else + *aEmailAddress = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aEmailAddress ? NS_OK : NS_ERROR_FAILURE; +#endif }

1 0

[tor-browser-build/master] Fold in 7.0.6 changelog and update release date
by gk＠torproject.org 03 Oct '17

03 Oct '17

commit 36600281908287e26153315dc2a3e7aa2e6d06e3 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 3 06:25:42 2017 +0000 Fold in 7.0.6 changelog and update release date --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 430aa8c..56fcb64 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 7.5a5 -- September 27 2017 +Tor Browser 7.5a5 -- September 28 2017 * All Platforms * Update Firefox to 52.4.0esr * Update Tor to 0.3.2.1-alpha @@ -35,6 +35,20 @@ Tor Browser 7.5a5 -- September 27 2017 * All Platforms * Switch from gitian/tor-browser-bundle to rbm/tor-browser-build +Tor Browser 7.0.6 -- September 28 2017 + * All Platforms + * Update Firefox to 52.4.0esr + * Update Tor to 0.3.1.7 + * Update Torbutton to 1.9.7.7 + * Bug 22542: Security Settings window too small on macOS 10.12 (fixup) + * Bug 20375: Warn users after entering fullscreen mode + * Update HTTPS-Everywhere to 2017.9.12 + * Update NoScript to 5.0.10 + * Bug 21830: Copying large text from web console leaks to /tmp + * Bug 23393: Don't crash all tabs when closing one tab + * OS X + * Bug 23404: Add missing Noto Sans Buginese font to the macOS whitelist + Tor Browser 7.0.5 -- September 4 2017 * All Platforms * Update Torbutton to 1.9.7.6

1 0

[tor-browser-build/master] Bug 23384: install and configure unattended-upgrades on build-sunet-a.torproject.net
by boklm＠torproject.org 02 Oct '17

02 Oct '17

commit fd97762cb0924eea137896425eab788daef6ca8d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 2 18:05:14 2017 +0200 Bug 23384: install and configure unattended-upgrades on build-sunet-a.torproject.net --- .../roles/unattended-upgrades/defaults/main.yml | 2 + .../roles/unattended-upgrades/tasks/main.yml | 18 +++++ .../unattended-upgrades/templates/20auto-upgrades | 2 + .../templates/50unattended-upgrades | 92 ++++++++++++++++++++++ tools/ansible/tbb-build.yml | 1 + 5 files changed, 115 insertions(+) diff --git a/tools/ansible/roles/unattended-upgrades/defaults/main.yml b/tools/ansible/roles/unattended-upgrades/defaults/main.yml new file mode 100644 index 0000000..f6351a7 --- /dev/null +++ b/tools/ansible/roles/unattended-upgrades/defaults/main.yml @@ -0,0 +1,2 @@ +--- +unattended_upgrade_mail: 'boklm(a)mars-attacks.org' diff --git a/tools/ansible/roles/unattended-upgrades/tasks/main.yml b/tools/ansible/roles/unattended-upgrades/tasks/main.yml new file mode 100644 index 0000000..de0892b --- /dev/null +++ b/tools/ansible/roles/unattended-upgrades/tasks/main.yml @@ -0,0 +1,18 @@ +--- + +- name: Install unattended-updates + apt: + name: unattended-upgrades + state: present + +- name: Install apt-listchanges + apt: + name: apt-listchanges + state: present + +- name: create /etc/apt/apt.conf.d/50unattended-upgrades + template: src=50unattended-upgrades dest=/etc/apt/apt.conf.d/50unattended-upgrades mode=0644 + +- name: create /etc/apt/apt.conf.d/20auto-upgrades + template: src=20auto-upgrades dest=/etc/apt/apt.conf.d/20auto-upgrades mode=0644 + diff --git a/tools/ansible/roles/unattended-upgrades/templates/20auto-upgrades b/tools/ansible/roles/unattended-upgrades/templates/20auto-upgrades new file mode 100644 index 0000000..8d6d7c8 --- /dev/null +++ b/tools/ansible/roles/unattended-upgrades/templates/20auto-upgrades @@ -0,0 +1,2 @@ +APT::Periodic::Update-Package-Lists "1"; +APT::Periodic::Unattended-Upgrade "1"; diff --git a/tools/ansible/roles/unattended-upgrades/templates/50unattended-upgrades b/tools/ansible/roles/unattended-upgrades/templates/50unattended-upgrades new file mode 100644 index 0000000..d4904ab --- /dev/null +++ b/tools/ansible/roles/unattended-upgrades/templates/50unattended-upgrades @@ -0,0 +1,92 @@ +// Unattended-Upgrade::Origins-Pattern controls which packages are +// upgraded. +// +// Lines below have the format format is "keyword=value,...". A +// package will be upgraded only if the values in its metadata match +// all the supplied keywords in a line. (In other words, omitted +// keywords are wild cards.) The keywords originate from the Release +// file, but several aliases are accepted. The accepted keywords are: +// a,archive,suite (eg, "stable") +// c,component (eg, "main", "crontrib", "non-free") +// l,label (eg, "Debian", "Debian-Security") +// o,origin (eg, "Debian", "Unofficial Multimedia Packages") +// n,codename (eg, "jessie", "jessie-updates") +// site (eg, "http.debian.net") +// The available values on the system are printed by the command +// "apt-cache policy", and can be debugged by running +// "unattended-upgrades -d" and looking at the log file. +// +// Within lines unattended-upgrades allows 2 macros whose values are +// derived from /etc/debian_version: +// ${distro_id} Installed origin. +// ${distro_codename} Installed codename (eg, "jessie") +Unattended-Upgrade::Origins-Pattern { + // Codename based matching: + // This will follow the migration of a release through different + // archives (e.g. from testing to stable and later oldstable). +// "o=Debian,n=jessie"; +// "o=Debian,n=jessie-updates"; +// "o=Debian,n=jessie-proposed-updates"; +// "o=Debian,n=jessie,l=Debian-Security"; + + // Archive or Suite based matching: + // Note that this will silently match a different release after + // migration to the specified archive (e.g. testing becomes the + // new stable). +// "o=Debian,a=stable"; +// "o=Debian,a=stable-updates"; +// "o=Debian,a=proposed-updates"; + "origin=Debian,codename=${distro_codename},label=Debian-Security"; +}; + +// List of packages to not update (regexp are supported) +Unattended-Upgrade::Package-Blacklist { +// "vim"; +// "libc6"; +// "libc6-dev"; +// "libc6-i686"; +}; + +// This option allows you to control if on a unclean dpkg exit +// unattended-upgrades will automatically run +// dpkg --force-confold --configure -a +// The default is true, to ensure updates keep getting installed +//Unattended-Upgrade::AutoFixInterruptedDpkg "false"; + +// Split the upgrade into the smallest possible chunks so that +// they can be interrupted with SIGUSR1. This makes the upgrade +// a bit slower but it has the benefit that shutdown while a upgrade +// is running is possible (with a small delay) +//Unattended-Upgrade::MinimalSteps "true"; + +// Install all unattended-upgrades when the machine is shuting down +// instead of doing it in the background while the machine is running +// This will (obviously) make shutdown slower +//Unattended-Upgrade::InstallOnShutdown "true"; + +// Send email to this address for problems or packages upgrades +// If empty or unset then no email is sent, make sure that you +// have a working mail setup on your system. A package that provides +// 'mailx' must be installed. E.g. "user(a)example.com" +Unattended-Upgrade::Mail "{{ unattended_upgrade_mail }}"; + +// Set this value to "true" to get emails only on errors. Default +// is to always send a mail if Unattended-Upgrade::Mail is set +//Unattended-Upgrade::MailOnlyOnError "true"; + +// Do automatic removal of new unused dependencies after the upgrade +// (equivalent to apt-get autoremove) +//Unattended-Upgrade::Remove-Unused-Dependencies "false"; + +// Automatically reboot *WITHOUT CONFIRMATION* if +// the file /var/run/reboot-required is found after the upgrade +//Unattended-Upgrade::Automatic-Reboot "false"; + +// If automatic reboot is enabled and needed, reboot at the specific +// time instead of immediately +// Default: "now" +//Unattended-Upgrade::Automatic-Reboot-Time "02:00"; + +// Use apt bandwidth limit feature, this example limits the download +// speed to 70kb/sec +//Acquire::http::Dl-Limit "70"; diff --git a/tools/ansible/tbb-build.yml b/tools/ansible/tbb-build.yml index 9f76b67..3d9f543 100644 --- a/tools/ansible/tbb-build.yml +++ b/tools/ansible/tbb-build.yml @@ -6,3 +6,4 @@ - role: useful-packages - role: tbb-team - role: mta + - role: unattended-upgrades

1 0

[tor-browser-build/master] Bug 23384: install dma (lightweight mail transport agent) on build-sunet-a.torproject.net
by boklm＠torproject.org 02 Oct '17

02 Oct '17

commit 39722d6b59c200710025b899e5f544a69bbeb943 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 2 17:27:54 2017 +0200 Bug 23384: install dma (lightweight mail transport agent) on build-sunet-a.torproject.net --- tools/ansible/roles/mta/tasks/main.yml | 6 ++++++ tools/ansible/tbb-build.yml | 1 + 2 files changed, 7 insertions(+) diff --git a/tools/ansible/roles/mta/tasks/main.yml b/tools/ansible/roles/mta/tasks/main.yml new file mode 100644 index 0000000..de469d8 --- /dev/null +++ b/tools/ansible/roles/mta/tasks/main.yml @@ -0,0 +1,6 @@ +--- + +- name: Install dma (DragonFly Mail Agent) + apt: + name: dma + state: present diff --git a/tools/ansible/tbb-build.yml b/tools/ansible/tbb-build.yml index e74e665..9f76b67 100644 --- a/tools/ansible/tbb-build.yml +++ b/tools/ansible/tbb-build.yml @@ -5,3 +5,4 @@ - role: tbb-builder - role: useful-packages - role: tbb-team + - role: mta

1 0

[tor-browser-build/master] Bump sandboxed-tor-browser version
by gk＠torproject.org 29 Sep '17

29 Sep '17

commit 712991345d023d987631a35998df6cf8736b5a2e Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 29 08:55:41 2017 +0000 Bump sandboxed-tor-browser version This is mainly for shipping a new version right after release as our alpha release broke 0.0.13 (see: #23692). --- projects/sandbox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/sandbox/config b/projects/sandbox/config index f9b0f76..0a79ac9 100644 --- a/projects/sandbox/config +++ b/projects/sandbox/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.0.13 +version: 0.0.14 git_url: https://git.torproject.org/tor-browser/sandboxed-tor-browser git_hash: 'sandboxed-tor-browser-[% c("version") %]' tag_gpg_id: 1

1 0

[tor-browser-build/master] Bug 22501: Requests via javascript: violate FPI
by gk＠torproject.org 29 Sep '17

29 Sep '17

commit ee2f06091d76272c7b629265d8c0a67c3d3b07e1 Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Sep 28 12:32:58 2017 -0700 Bug 22501: Requests via javascript: violate FPI By default NoScript attempts to find URLs in "javascript:.*" strings found in <a> element href atributes and in <option> element value attributes. When such links (or options) are clicked/selected, NoScript attempts to navigate the page to said URL. These navigations are treated as intternal requests, and get pacced onto the catch-all circuit. This behaviour can be turned off by disabling the 'noscript.fixLinks' flag, so we do so for each Tor Browser build target's extension-overrides.js. --- .../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/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index ded3d5b..c610aff 100644 --- a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -38,6 +38,7 @@ pref("noscript.temp", ""); pref("noscript.untrusted", ""); pref("noscript.forbidMedia", false); pref("noscript.allowWhitelistUpdates", false); +pref("noscript.fixLinks", false); // Now handled by plugins.click_to_play pref("noscript.forbidFlash", false); pref("noscript.forbidSilverlight", false); diff --git a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index ded3d5b..c610aff 100644 --- a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -38,6 +38,7 @@ pref("noscript.temp", ""); pref("noscript.untrusted", ""); pref("noscript.forbidMedia", false); pref("noscript.allowWhitelistUpdates", false); +pref("noscript.fixLinks", false); // Now handled by plugins.click_to_play pref("noscript.forbidFlash", false); pref("noscript.forbidSilverlight", false); diff --git a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index ded3d5b..c610aff 100644 --- a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -38,6 +38,7 @@ pref("noscript.temp", ""); pref("noscript.untrusted", ""); pref("noscript.forbidMedia", false); pref("noscript.allowWhitelistUpdates", false); +pref("noscript.fixLinks", false); // Now handled by plugins.click_to_play pref("noscript.forbidFlash", false); pref("noscript.forbidSilverlight", false);

1 0

[tor-browser-build/master] Bug 23680: document the types of builds (testbuild/nightly/alpha) in README.HACKING
by gk＠torproject.org 28 Sep '17

28 Sep '17

commit 2d5b42b7b8bea03bf55fc3ad2c1ea993e18af191 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 28 12:17:12 2017 +0200 Bug 23680: document the types of builds (testbuild/nightly/alpha) in README.HACKING --- README.HACKING | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/README.HACKING b/README.HACKING index e328ea1..d9ebf63 100644 --- a/README.HACKING +++ b/README.HACKING @@ -238,6 +238,10 @@ the new commits. If you want to fetch new commits automatically when starting a new build you can add a "fetch: 1" line to projects/firefox/config. +Remember that the git_hash option has different definitions for alpha +and nightly builds, so you should modify the right one depending on +what type of build you are doing (see also the "Types of builds" section). + The Firefox mozconfig files --------------------------- @@ -293,3 +297,20 @@ For example, if you want to try a Linux x86_64 alpha build, you can run: $ /path_to_rbm/rbm build release --target alpha --target \ torbrowser-linux-x86_64 + +Types of builds: nightly, alpha, release and testbuild +------------------------------------------------------ + +The testbuild makefile target allows you to do a build quickly in the +testbuild directory, skipping the generation of all the locales and the +mar files. This is useful during development. + +By default the testbuild is based on the alpha build. All the options +can have a different definition for the alpha, release and nightly builds. +Usually the git_hash option has a different definition for the nightly +builds in order to point to the master branch. + +If you want your testbuild target to create builds based on nightly +rather than alpha, you can edit your rbm.local.conf file and uncomment +the targets/torbrowser-testbuild definition. +

1 0

[tor-browser-build/master] Bug 23630: Clarify README.HACKING on using a firefox git repository
by gk＠torproject.org 26 Sep '17

26 Sep '17

commit 43e5d8803933af80e6e71005a5f64338c91680d7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 25 18:10:04 2017 +0200 Bug 23630: Clarify README.HACKING on using a firefox git repository --- README.HACKING | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/README.HACKING b/README.HACKING index 31b8352..e328ea1 100644 --- a/README.HACKING +++ b/README.HACKING @@ -218,8 +218,25 @@ build with the patch. As an alternative, if you have your patch in a git repository, you can edit projects/firefox/config to change the git_url option to point to your git repository, and change the git_hash option to point to the -commit you want to build. You will also need to comment the -'tag_gpg_id: 1' line (unless git_hash is pointing to a signed git tag). +commit you want to build. If the new git_hash option is not pointing to +a signed tag, you will also need to comment the 'tag_gpg_id: 1' line. +The git_hash option can point to a tag, a commit, a branch or anything +that is understood by git. + +If you specify a branch in the git_hash option, you don't need to prefix +it with a git remote name as all branches from the git repository +selected in the git_url option are created as local branches. + +If you want to work on a local git repository, it is not a good idea to +work on the git_clones/firefox repository directly. Instead you should +create a separate git repository and update the git_url option with a +file:// URL pointing to your repository. + +After changing the git_url option or when new commits have been added +to a branch, you should run "make fetch" before starting a build to get +the new commits. If you want to fetch new commits automatically when +starting a new build you can add a "fetch: 1" line to +projects/firefox/config. The Firefox mozconfig files

1 0

[tor-browser-build/master] Preparing a -build5
by gk＠torproject.org 26 Sep '17

26 Sep '17

commit 8eeb8c032e450b15cc4151409b1baa533db33364 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 26 09:07:46 2017 +0000 Preparing a -build5 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 6757422..0b0193d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5a5' - torbrowser_build: 'build4' + torbrowser_build: 'build5' torbrowser_incremental_from: - 7.5a4 project_name: tor-browser

1 0

[tor-browser-build/master] Bug 23654: fix ja dmg file name
by gk＠torproject.org 26 Sep '17

26 Sep '17

commit f42778f91a144375f29b2f584073e3b63b564553 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Sep 26 10:46:38 2017 +0200 Bug 23654: fix ja dmg file name --- projects/tor-browser/build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 31c2d6d..6540245 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -327,6 +327,10 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ tar_args => '-cJf $OUTDIR/tor-browser-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_' _ lang _ '.tar.xz', }) %] [% ELSIF c("var/osx") %] + [% # Rename the Japanese bundle to not confuse users + IF lang == 'ja-JP-mac'; + SET lang = 'ja'; + END; -%] [% c('var/ddmg', { dmg_src => tbdir, dmg_out => '$OUTDIR/TorBrowser-' _ c("var/torbrowser_version") _ '-osx64_' _ lang _ '.dmg',

1 0

[tor-browser-build/master] Bug 23384: install libyaml-perl on build-sunet-a.torproject.net
by boklm＠torproject.org 22 Sep '17

22 Sep '17

commit d9721520bc4b52aa2cf98fee35db9a5b58bfef39 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 22 22:14:57 2017 +0200 Bug 23384: install libyaml-perl on build-sunet-a.torproject.net --- tools/ansible/roles/tbb-builder/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/ansible/roles/tbb-builder/tasks/main.yml b/tools/ansible/roles/tbb-builder/tasks/main.yml index eb44819..f3a857c 100644 --- a/tools/ansible/roles/tbb-builder/tasks/main.yml +++ b/tools/ansible/roles/tbb-builder/tasks/main.yml @@ -34,6 +34,7 @@ - libxml-libxml-perl - libwww-perl - libjson-perl + - libyaml-perl - name: Create the tbb-build group group:

1 0

[tor-browser-build/master] Bump build version
by gk＠torproject.org 22 Sep '17

22 Sep '17

commit 540627c5a51ba9f66a8077a76cb0f2cc87da9660 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 22 18:39:59 2017 +0000 Bump build version --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 133b548..6757422 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5a5' - torbrowser_build: 'build1' + torbrowser_build: 'build4' torbrowser_incremental_from: - 7.5a4 project_name: tor-browser

1 0

[tor-browser-build/master] Revert "Pick up new selfrando tag (needed for bug 22692)"
by gk＠torproject.org 22 Sep '17

22 Sep '17

commit 59814e17f3189f560263b807d61c4359a03bd4ed Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 22 18:38:04 2017 +0000 Revert "Pick up new selfrando tag (needed for bug 22692)" This reverts commit b6b18835b675dc1cae04faf474474d6a2ec65677. --- projects/selfrando/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/selfrando/config b/projects/selfrando/config index f8afa5d..33e7272 100644 --- a/projects/selfrando/config +++ b/projects/selfrando/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 0.3.3 +version: 0.3.2 git_hash: 'tb-v[% c("version") %]' git_url: https://github.com/immunant/selfrando.git gpg_keyring: selfrando.gpg diff --git a/rbm.conf b/rbm.conf index 980b55d..133b548 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5a5' - torbrowser_build: 'build3' + torbrowser_build: 'build1' torbrowser_incremental_from: - 7.5a4 project_name: tor-browser

1 0

[tor-browser-build/master] Bug 22692: Don't use mremap in selfrando code
by gk＠torproject.org 22 Sep '17

22 Sep '17

commit 85537ff8b5a7294138ed57e44818512aaabb9d57 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 6 11:29:35 2017 +0000 Bug 22692: Don't use mremap in selfrando code --- projects/selfrando/build | 2 +- projects/selfrando/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/selfrando/build b/projects/selfrando/build index 18437b5..14d9dcf 100644 --- a/projects/selfrando/build +++ b/projects/selfrando/build @@ -14,7 +14,7 @@ tar -C /var/tmp/dist -xf $rootdir/[% project %]-[% c("version") %].tar.gz cd /var/tmp/dist mv [% project %]-[% c("version") %] [% project %] cd [% project %] -scons -Q arch=[% c("var/selfrando_arch") %] LIBELF_PATH="/var/tmp/dist/elfutils" FORCE_INPLACE=1 DEBUG_LEVEL=env WRITE_LAYOUTS=env LOG=console +scons -Q arch=[% c("var/selfrando_arch") %] LIBELF_PATH="/var/tmp/dist/elfutils" NO_MREMAP=1 FORCE_INPLACE=1 DEBUG_LEVEL=env WRITE_LAYOUTS=env LOG=console # Fix the path where we install selfrando sed -i 's|^SR_PATH=.*|SR_PATH=/var/tmp/dist/selfrando/out/[% c("var/selfrando_arch") %]/bin|' Tools/TorBrowser/tc-wrapper/ld diff --git a/projects/selfrando/config b/projects/selfrando/config index 33e7272..f8afa5d 100644 --- a/projects/selfrando/config +++ b/projects/selfrando/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 0.3.2 +version: 0.3.3 git_hash: 'tb-v[% c("version") %]' git_url: https://github.com/immunant/selfrando.git gpg_keyring: selfrando.gpg

1 0

[tor-browser-build/master] Bug 23384: fix syntax to work with ansible 2.2
by boklm＠torproject.org 22 Sep '17

22 Sep '17

commit da8ca6fbef84c2b324802db154cfd82bad78c506 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 22 18:09:02 2017 +0200 Bug 23384: fix syntax to work with ansible 2.2 https://docs.ansible.com/ansible/latest/porting_guide_2.0.html#deprecated --- tools/ansible/roles/tbb-team/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ansible/roles/tbb-team/tasks/main.yml b/tools/ansible/roles/tbb-team/tasks/main.yml index 9beaf0b..5cc5755 100644 --- a/tools/ansible/roles/tbb-team/tasks/main.yml +++ b/tools/ansible/roles/tbb-team/tasks/main.yml @@ -5,11 +5,11 @@ state: present groups: tbb-build shell: /bin/bash - with_items: tbb_team_members + with_items: "{{ tbb_team_members }}" - name: Add ssh keys to authorized_keys authorized_key: user: "{{ item }}" state: present key: "{{ lookup('file', item + '.pub') }}" - with_items: tbb_team_members + with_items: "{{ tbb_team_members }}"

1 0

[tor-browser-build/master] Bug 23384: install dependencies for update_responses on build-sunet-a.torproject.net
by boklm＠torproject.org 22 Sep '17

22 Sep '17

commit 9c79f069e6942d3520612d1a24e6bde70e804e4e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 22 18:01:25 2017 +0200 Bug 23384: install dependencies for update_responses on build-sunet-a.torproject.net --- tools/ansible/roles/tbb-builder/tasks/main.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/ansible/roles/tbb-builder/tasks/main.yml b/tools/ansible/roles/tbb-builder/tasks/main.yml index 2edfc18..eb44819 100644 --- a/tools/ansible/roles/tbb-builder/tasks/main.yml +++ b/tools/ansible/roles/tbb-builder/tasks/main.yml @@ -23,6 +23,18 @@ - curl - runc +- name: Install dependencies for update_responses script + apt: + name: "{{ item }}" + state: present + with_items: + - libfindbin-libs-perl + - libxml-writer-perl + - libparallel-forkmanager-perl + - libxml-libxml-perl + - libwww-perl + - libjson-perl + - name: Create the tbb-build group group: name: tbb-build

1 0

[tor-browser-build/master] Picking up new tor-browser tag
by gk＠torproject.org 22 Sep '17

22 Sep '17

commit 7fcbbaa6ad86c18743b59f5847b01bf30eeb52d4 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 22 10:16:30 2017 +0000 Picking up new tor-browser tag --- projects/firefox/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 8ff795a..5fe6eb1 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 8fd3351..980b55d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5a5' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 7.5a4 project_name: tor-browser

1 0

[tor-browser/tor-browser-52.4.0esr-7.5-1] fixup! Bug 16010: Fixing sandbox compile issues
by gk＠torproject.org 22 Sep '17

22 Sep '17

commit 0a9793458e9ddd5c7742d3ceb250125c52e8bf86 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 22 09:45:57 2017 +0000 fixup! Bug 16010: Fixing sandbox compile issues --- .../sandbox/chromium/base/strings/utf_string_conversion_utils.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/security/sandbox/chromium/base/strings/utf_string_conversion_utils.cc b/security/sandbox/chromium/base/strings/utf_string_conversion_utils.cc index 710fbd83a358..3942728adafa 100644 --- a/security/sandbox/chromium/base/strings/utf_string_conversion_utils.cc +++ b/security/sandbox/chromium/base/strings/utf_string_conversion_utils.cc @@ -122,7 +122,9 @@ void PrepareForUTF8Output(const CHAR* src, // Instantiate versions we know callers will need. template void PrepareForUTF8Output(const wchar_t*, size_t, std::string*); -//template void PrepareForUTF8Output(const char16*, size_t, std::string*); +#if !defined(__MINGW32__) +template void PrepareForUTF8Output(const char16*, size_t, std::string*); +#endif template<typename STRING> void PrepareForUTF16Or32Output(const char* src, @@ -143,6 +145,8 @@ void PrepareForUTF16Or32Output(const char* src, // Instantiate versions we know callers will need. template void PrepareForUTF16Or32Output(const char*, size_t, std::wstring*); -//template void PrepareForUTF16Or32Output(const char*, size_t, string16*); +#if !defined(__MINGW32__) +template void PrepareForUTF16Or32Output(const char*, size_t, string16*); +#endif } // namespace base

1 0

[tor-browser-build/master] There is no -2 tor-browser branch right now
by gk＠torproject.org 22 Sep '17

22 Sep '17

commit 54a70f3e97cd35b7d17717a8da5ac54528823cb8 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 22 09:57:30 2017 +0000 There is no -2 tor-browser branch right now --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index fe05fbc..8ff795a 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -28,7 +28,7 @@ targets: torbrowser_update_channel: release nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0 var: torbrowser_update_channel: default

1 0