March 2019 - tor-commits - lists.torproject.org

[torbutton/master] Bug 29440: Update about:tor when Tor Browser is updated
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 82a5f8665a6b5a7f5d4c78f0a526dfa16834ec7f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Mar 11 11:28:20 2019 -0400 Bug 29440: Update about:tor when Tor Browser is updated After the browser has been updated, notify the user by displaying a message on the about:tor page. Also, in release and alpha builds, include on the about:tor page below the Tor Browser version a link to a simplified changelog page (which continues to be located at about:tbupdate). --- src/chrome/content/aboutTor/aboutTor-content.js | 15 +++++++++-- src/chrome/content/aboutTor/aboutTor.xhtml | 16 +++++++++--- src/chrome/content/torbutton.js | 30 +++++++++++++++++++--- src/chrome/locale/en-US/aboutTBUpdate.dtd | 6 +++-- src/chrome/locale/en-US/aboutTor.dtd | 2 ++ src/chrome/skin/aboutTor.css | 33 ++++++++++++++++--------- 6 files changed, 79 insertions(+), 23 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index b91fd17d..2b65dbcf 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -94,6 +94,17 @@ var AboutTorListener = { else body.removeAttribute("showmanual"); + if (aData.updateChannel) + body.setAttribute("updatechannel", aData.updateChannel); + else + body.removeAttribute("updatechannel"); + + if (aData.hasBeenUpdated) { + body.setAttribute("hasbeenupdated", "yes"); + content.document.getElementById("update-infolink").setAttribute("href", + aData.updateMoreInfoURL); + } + if (aData.mobile) body.setAttribute("mobile", "yes"); @@ -114,11 +125,11 @@ var AboutTorListener = { .createBundle(kBrandBundle); let productName = brandBundle.GetStringFromName("brandFullName"); let tbbVersion = Services.prefs.getCharPref("torbrowser.version"); - elem = content.document.getElementById("torstatus-version"); + let elem = content.document.getElementById("torbrowser-version"); while (elem.firstChild) elem.removeChild(elem.firstChild); - elem.appendChild(content.document.createTextNode(productName + '\n' + elem.appendChild(content.document.createTextNode(productName + ' ' + tbbVersion)); } catch (e) {} } diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 639c2fca..0789f851 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -14,6 +14,8 @@ %globalDTD; <!ENTITY % aboutTorDTD SYSTEM "chrome://torbutton/locale/aboutTor.dtd"> %aboutTorDTD; + <!ENTITY % tbUpdateDTD SYSTEM "chrome://browser/locale/aboutTBUpdate.dtd"> + %tbUpdateDTD; ]> <html xmlns="http://www.w3.org/1999/xhtml"> @@ -33,15 +35,23 @@ window.addEventListener("pageshow", function() { </head> <body dir="&locale.dir;"> <div class="torcontent-container"> - <div id="torstatus-version"/> + <div id="torbrowser-info"> + <div id="torbrowser-version"/> + <div id="torbrowser-changelog-link"><a href="about:tbupdate">&aboutTor.viewChangelog.label;</a></div> + </div> <img class="torcontent-logo" src="resource://torbutton-assets/torbrowser_mobile_logo.png"/> <div id="torstatus" class="top"> - <div id="torstatus-on-container" class="hideIfTorOff torstatus-container"> + <div class="hideIfTorOff hideIfHasBeenUpdated torstatus-container"> <div class="heading1">&aboutTor.ready.label;</div> <br/> <div class="heading2">&aboutTor.ready2.label;</div> </div> - <div id="torstatus-off-container" class="hideIfTorOn torstatus-container"> + <div class="showIfHasBeenUpdated torstatus-container"> + <div class="heading1">&aboutTBUpdate.updated;</div> + <br/> + <div class="heading2">&aboutTBUpdate.linkPrefix;<a id="update-infolink">&aboutTBUpdate.linkLabel;</a>&aboutTBUpdate.linkSuffix;</div> + </div> + <div class="hideIfTorOn torstatus-container"> <div class="heading1">&aboutTor.failure.label;</div> <br/> <div class="heading2">&aboutTor.failure2.label;</div> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index f99be5b0..b425a276 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -8,6 +8,7 @@ // http://kb.mozillazine.org/Links_to_local_pages_don%27t_work let { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); +const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm"); let { showDialog, show_torbrowser_manual } = Cu.import("resource://torbutton/modules/utils.js", {}); let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); @@ -418,7 +419,7 @@ var torbutton_abouttor_message_handler = { switch(aMessage.name) { case "AboutTor:Loaded": aMessage.target.messageManager.sendAsyncMessage("AboutTor:ChromeData", - this.chromeData); + this.getChromeData(true)); break; } }, @@ -426,7 +427,7 @@ var torbutton_abouttor_message_handler = { // Send privileged data to all of the about:tor content scripts. updateAllOpenPages: function() { window.messageManager.broadcastAsyncMessage("AboutTor:ChromeData", - this.chromeData); + this.getChromeData(false)); }, // The chrome data contains all of the data needed by the about:tor @@ -434,11 +435,32 @@ var torbutton_abouttor_message_handler = { // It is sent to the content process when an about:tor window is opened // and in response to events such as the browser noticing that Tor is // not working. - get chromeData() { - return { + getChromeData: function(aIsRespondingToPageLoad) { + let dataObj = { mobile: torbutton_is_mobile(), + updateChannel: AppConstants.MOZ_UPDATE_CHANNEL, torOn: torbutton_tor_check_ok() }; + + if (aIsRespondingToPageLoad) { + const kShouldNotifyPref = "torbrowser.post_update.shouldNotify"; + if (m_tb_prefs.getBoolPref(kShouldNotifyPref, false)) { + m_tb_prefs.clearUserPref(kShouldNotifyPref); + dataObj.hasBeenUpdated = true; + dataObj.updateMoreInfoURL = this.getUpdateMoreInfoURL(); + } + } + + return dataObj; + }, + + getUpdateMoreInfoURL: function() { + try { + return Services.prefs.getCharPref("torbrowser.post_update.url"); + } catch (e) {} + + // Use the default URL as a fallback. + return Services.urlFormatter.formatURLPref("startup.homepage_override_url"); } }; diff --git a/src/chrome/locale/en-US/aboutTBUpdate.dtd b/src/chrome/locale/en-US/aboutTBUpdate.dtd index 37567bd7..2d1e59b4 100644 --- a/src/chrome/locale/en-US/aboutTBUpdate.dtd +++ b/src/chrome/locale/en-US/aboutTBUpdate.dtd @@ -1,6 +1,8 @@ -<!ENTITY aboutTBUpdate.title "Tor Browser Update"> +<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Changelog"> <!ENTITY aboutTBUpdate.updated "Tor Browser has been updated."> <!ENTITY aboutTBUpdate.linkPrefix "For the most up-to-date information about this release, "> <!ENTITY aboutTBUpdate.linkLabel "visit our website"> <!ENTITY aboutTBUpdate.linkSuffix "."> -<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> +<!ENTITY aboutTBUpdate.version "Version"> +<!ENTITY aboutTBUpdate.releaseDate "Release Date"> +<!ENTITY aboutTBUpdate.releaseNotes "Release Notes"> diff --git a/src/chrome/locale/en-US/aboutTor.dtd b/src/chrome/locale/en-US/aboutTor.dtd index 1400d7b5..4f360a91 100644 --- a/src/chrome/locale/en-US/aboutTor.dtd +++ b/src/chrome/locale/en-US/aboutTor.dtd @@ -6,6 +6,8 @@ <!ENTITY aboutTor.title "About Tor"> +<!ENTITY aboutTor.viewChangelog.label "View Changelog"> + <!ENTITY aboutTor.ready.label "Explore. Privately."> <!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> <!ENTITY aboutTor.failure.label "Something Went Wrong!"> diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 1bdf301d..baa92b42 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -60,16 +60,25 @@ body:not([initialized]) { } } -#torstatus-version { +#torbrowser-info { position: absolute; - top: 6px; - offset-inline-end: 6px; - inset-inline-end: 6px; - height: 30px; + top: 16px; + offset-inline-end: 16px; + inset-inline-end: 16px; + height: 36px; width: 200px; - font-size: 15px; +} + +#torbrowser-info div { + font-size: 14px; white-space: pre-wrap; text-align: end; + margin-bottom: 6px; +} + +/* Hide "View Changelog" link if update channel is not release or alpha. */ +body:not([updatechannel="release"]):not([updatechannel="alpha"]) #torbrowser-changelog-link { + display: none; } a { @@ -79,15 +88,13 @@ a { #torstatus { margin-top: 135px; display: flex; - justify-content: center; + flex-direction: column; + align-content: center; + justify-content: flex-end; vertical-align: bottom; min-height: 92px; } -#torstatus > div { - align-self: flex-end; /* align text to bottom of container */ -} - .top { white-space: nowrap; } @@ -96,11 +103,13 @@ a { text-align: center; } +body[hasbeenupdated] .hideIfHasBeenUpdated, body[toron] .hideIfTorOn, body:not([toron]) .hideIfTorOff { display: none; } +body:not([hasbeenupdated]) .showIfHasBeenUpdated, body:not([showmanual]) .showForManual { display: none; } @@ -303,7 +312,7 @@ body:not([showmanual]) .showForManual { display: none; } -body[mobile] #torstatus-version, +body[mobile] #torbrowser-info, body[mobile] .searchbox, body[mobile] .top .heading2, body[mobile] #manual,

1 0

[translation/donatepages-messagespot_completed] Update translations for donatepages-messagespot_completed
by translation＠torproject.org 13 Mar '19

13 Mar '19

commit d535545e2ec1d4c094514f9a058bf526bd0480ec Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 13 15:15:35 2019 +0000 Update translations for donatepages-messagespot_completed --- locale/tr/LC_MESSAGES/messages.po | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/locale/tr/LC_MESSAGES/messages.po b/locale/tr/LC_MESSAGES/messages.po index ab7155ebc..a8199a34b 100644 --- a/locale/tr/LC_MESSAGES/messages.po +++ b/locale/tr/LC_MESSAGES/messages.po @@ -870,8 +870,8 @@ msgid "" "The vast majority of Tor users are ordinary people who want control of their" " privacy online or people whose internet use is censored." msgstr "" -"Tor kullanıcılarının büyük çoğunluğu, çevrimiçi gizlilik kontrolünü isteyen " -"sıradan insanlar veya internet kullanımı sansürlenen kişilerdir." +"Tor kullanıcılarının büyük çoğunluğu, çevrimiçi gizliliklerini korumak " +"isteyen ya da İnternet kullanımına engeller konulmuş sıradan insanlardır." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:101 msgid "" @@ -879,16 +879,16 @@ msgid "" "survivors, policymakers, diplomats, and academic and research institutions." msgstr "" "Diğer Tor kullanıcıları gazeteciler, insan hakları savunucuları, aile içi " -"şiddet mağdurları, politika yapıcılar, diplomatlar ve akademik ve araştırma " -"kurumlarıdır." +"şiddet mağdurları, politika yapıcılar, diplomatlar ve akademik çalışanlar " +"ile araştırma kuruluşlarıdır." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:107 msgid "Can anyone use Tor?" -msgstr "Herkes Tor'u kullanabilir mi?" +msgstr "Herkes Tor kullanabilir mi?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:111 msgid "Yes! Tor is free, and anyone can use it." -msgstr "Kesinlikle! Tor bedavadır ve herkes kullanabilir." +msgstr "Kesinlikle! Tor ücretsizdir ve isteyen herkes kullanabilir." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:113 msgid "" @@ -896,9 +896,9 @@ msgid "" "href=\"https://www.torproject.org/projects/torbrowser.html.en\"><span " "class=\"links\">download Tor Browser</span></a>." msgstr "" -"Başlarken, <a class=\"hyperlinks\" target=\"_blank\" " +"Başlamak için <a class=\"hyperlinks\" target=\"_blank\" " "href=\"https://www.torproject.org/projects/torbrowser.html.en\"><span " -"class=\"links\">Tor Browser'ı indirmeniz </span></a> gerekiyor. " +"class=\"links\">Tor Browser uygulamasını indirmeniz </span></a> gerekir." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:115 msgid "" @@ -911,20 +911,20 @@ msgid "" "href=\"https://www.torproject.org/projects/torbrowser.html.en#linux\">Linux</a>." msgstr "" "<a class=\"hyperlinks links\" target=\"_blank\" " -"href=\"https://www.torproject.org/projects/torbrowser.html.en#windows\">Windows</a>,<a" -" class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.torproject.org/projects/torbrowser.html.en#windows\">Windows</a>," +" <a class=\"hyperlinks links\" target=\"_blank\" " "href=\"https://www.torproject.org/projects/torbrowser.html.en#macosx\">Mac " "OS X</a> ve <a class=\"hyperlinks links\" target=\"_blank\" " "href=\"https://www.torproject.org/projects/torbrowser.html.en#linux\">Linux</a>" -" için nasıl yükleyeceğinize ilişkin yollar sunduk." +" için indirme işleminin nasıl yapılacağını anlattık." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:121 msgid "What kinds of people support Tor?" -msgstr "Ne tür insanlar Tor'u destekler?" +msgstr "Tor kimler tarafından desteklenir?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:125 msgid "All kinds of people." -msgstr "Her çeşit insan." +msgstr "Her çeşit insan tarafından." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:127 msgid ""

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 13 Mar '19

13 Mar '19

commit e4ab26bfbe1929a94ef77505677605e780ce3004 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 13 15:15:28 2019 +0000 Update translations for donatepages-messagespot --- locale/tr/LC_MESSAGES/messages.po | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/locale/tr/LC_MESSAGES/messages.po b/locale/tr/LC_MESSAGES/messages.po index ab7155ebc..a8199a34b 100644 --- a/locale/tr/LC_MESSAGES/messages.po +++ b/locale/tr/LC_MESSAGES/messages.po @@ -870,8 +870,8 @@ msgid "" "The vast majority of Tor users are ordinary people who want control of their" " privacy online or people whose internet use is censored." msgstr "" -"Tor kullanıcılarının büyük çoğunluğu, çevrimiçi gizlilik kontrolünü isteyen " -"sıradan insanlar veya internet kullanımı sansürlenen kişilerdir." +"Tor kullanıcılarının büyük çoğunluğu, çevrimiçi gizliliklerini korumak " +"isteyen ya da İnternet kullanımına engeller konulmuş sıradan insanlardır." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:101 msgid "" @@ -879,16 +879,16 @@ msgid "" "survivors, policymakers, diplomats, and academic and research institutions." msgstr "" "Diğer Tor kullanıcıları gazeteciler, insan hakları savunucuları, aile içi " -"şiddet mağdurları, politika yapıcılar, diplomatlar ve akademik ve araştırma " -"kurumlarıdır." +"şiddet mağdurları, politika yapıcılar, diplomatlar ve akademik çalışanlar " +"ile araştırma kuruluşlarıdır." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:107 msgid "Can anyone use Tor?" -msgstr "Herkes Tor'u kullanabilir mi?" +msgstr "Herkes Tor kullanabilir mi?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:111 msgid "Yes! Tor is free, and anyone can use it." -msgstr "Kesinlikle! Tor bedavadır ve herkes kullanabilir." +msgstr "Kesinlikle! Tor ücretsizdir ve isteyen herkes kullanabilir." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:113 msgid "" @@ -896,9 +896,9 @@ msgid "" "href=\"https://www.torproject.org/projects/torbrowser.html.en\"><span " "class=\"links\">download Tor Browser</span></a>." msgstr "" -"Başlarken, <a class=\"hyperlinks\" target=\"_blank\" " +"Başlamak için <a class=\"hyperlinks\" target=\"_blank\" " "href=\"https://www.torproject.org/projects/torbrowser.html.en\"><span " -"class=\"links\">Tor Browser'ı indirmeniz </span></a> gerekiyor. " +"class=\"links\">Tor Browser uygulamasını indirmeniz </span></a> gerekir." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:115 msgid "" @@ -911,20 +911,20 @@ msgid "" "href=\"https://www.torproject.org/projects/torbrowser.html.en#linux\">Linux</a>." msgstr "" "<a class=\"hyperlinks links\" target=\"_blank\" " -"href=\"https://www.torproject.org/projects/torbrowser.html.en#windows\">Windows</a>,<a" -" class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.torproject.org/projects/torbrowser.html.en#windows\">Windows</a>," +" <a class=\"hyperlinks links\" target=\"_blank\" " "href=\"https://www.torproject.org/projects/torbrowser.html.en#macosx\">Mac " "OS X</a> ve <a class=\"hyperlinks links\" target=\"_blank\" " "href=\"https://www.torproject.org/projects/torbrowser.html.en#linux\">Linux</a>" -" için nasıl yükleyeceğinize ilişkin yollar sunduk." +" için indirme işleminin nasıl yapılacağını anlattık." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:121 msgid "What kinds of people support Tor?" -msgstr "Ne tür insanlar Tor'u destekler?" +msgstr "Tor kimler tarafından desteklenir?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:125 msgid "All kinds of people." -msgstr "Her çeşit insan." +msgstr "Her çeşit insan tarafından." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:127 msgid ""

1 0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Revert "Bug 26962 - implement new features onboarding (part 2)."
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 681eefdd4234007f4984dd88abc2dfe10cbc2740 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Mar 6 16:04:42 2019 -0500 Revert "Bug 26962 - implement new features onboarding (part 2)." This reverts commit 73018a0de3eab8cf12f0b9554a7595b35ceaeb53. --- .../base/content/abouttbupdate/aboutTBUpdate.css | 25 ---------------------- .../base/content/abouttbupdate/aboutTBUpdate.js | 9 +------- .../base/content/abouttbupdate/aboutTBUpdate.xhtml | 5 ----- browser/base/content/tab-content.js | 10 --------- .../locales/en-US/chrome/browser/aboutTBUpdate.dtd | 4 ---- 5 files changed, 1 insertion(+), 52 deletions(-) diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.css b/browser/base/content/abouttbupdate/aboutTBUpdate.css index dc42f8ff5f9e..90252d77a739 100644 --- a/browser/base/content/abouttbupdate/aboutTBUpdate.css +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.css @@ -53,31 +53,6 @@ a { margin-bottom: 20px; } -#new-features { - margin-bottom: 15px; - padding: 10px; - text-align: center; - /* swap text and background colors in this section */ - color: var(--abouttor-bg-toron-color); - background-color: var(--abouttor-text-color); -} - -#new-features-description { - margin: 15px auto; - max-width: 500px; - font-size: 85%; -} - -#new-features button { - padding: 8px 20px; - border: none; - border-radius: 3px; - font-size: 90%; - color: var(--abouttor-text-color); - background-color: var(--abouttor-bg-toron-color); - cursor: pointer; -} - #changelog-container { margin: 0px 20px 20px 20px; } diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.js b/browser/base/content/abouttbupdate/aboutTBUpdate.js index fa8bd3241a28..8243647c5708 100644 --- a/browser/base/content/abouttbupdate/aboutTBUpdate.js +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.js @@ -1,4 +1,4 @@ -// Copyright (c) 2018, The Tor Project, Inc. +// Copyright (c) 2015, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -8,10 +8,3 @@ function init() let event = new CustomEvent("AboutTBUpdateLoad", { bubbles: true }); document.dispatchEvent(event); } - -function showNewFeaturesOnboarding() -{ - let event = new CustomEvent("AboutTBUpdateNewFeaturesOnboarding", - { bubbles: true }); - document.dispatchEvent(event); -} diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml index a046f2658a5a..fe8ed69b537f 100644 --- a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml @@ -28,11 +28,6 @@ </div> </div> <br clear="all"/> -<div id="new-features"> - <div>&aboutTBUpdate.circuitDisplayHeading;</div> - <div id="new-features-description">&aboutTBUpdate.circuitDisplayDescription;</div> - <button onclick="showNewFeaturesOnboarding()">&aboutTBUpdate.learnMore;</button> -</div> <div id="changelog-container"> <div id="changelog-heading">&aboutTBUpdate.changeLogHeading;</div> <div id="changelog"></div> diff --git a/browser/base/content/tab-content.js b/browser/base/content/tab-content.js index c0987dbc05c7..e0cf6747aaa4 100644 --- a/browser/base/content/tab-content.js +++ b/browser/base/content/tab-content.js @@ -359,8 +359,6 @@ AboutReaderListener.init(); let AboutTBUpdateListener = { init: function(chromeGlobal) { chromeGlobal.addEventListener('AboutTBUpdateLoad', this, false, true); - chromeGlobal.addEventListener("AboutTBUpdateNewFeaturesOnboarding", - this, false, true); }, get isAboutTBUpdate() { @@ -375,9 +373,6 @@ let AboutTBUpdateListener = { case "AboutTBUpdateLoad": this.onPageLoad(); break; - case "AboutTBUpdateNewFeaturesOnboarding": - this.onNewFeaturesOnboarding(); - break; case "pagehide": this.onPageHide(aEvent); break; @@ -411,11 +406,6 @@ let AboutTBUpdateListener = { removeEventListener("pagehide", this, true); }, - onNewFeaturesOnboarding: function() { - // Tell the onboarding extension to open the circuit display onboarding. - sendAsyncMessage("Onboarding:OnContentMessage", - {action: "tor-open-circuit-display-page"}); - }, }; AboutTBUpdateListener.init(this); #endif diff --git a/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd b/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd index f7b3f2ed8fcd..37567bd7e38c 100644 --- a/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd +++ b/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd @@ -4,7 +4,3 @@ <!ENTITY aboutTBUpdate.linkLabel "visit our website"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> - -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> -<!ENTITY aboutTBUpdate.learnMore "Learn More">

1 0

[tor-browser/tor-browser-60.5.1esr-8.5-1] squash! Bug 16940: After update, load local change notes.
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 0c7bd3b2fa73e8be38f5aac46cbc68d025071f05 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Mar 7 15:48:00 2019 -0500 squash! Bug 16940: After update, load local change notes. Also fix bug 29440. Now about:tbupdate is styled as a fairly simple changelog page that is designed to be displayed via a link that is on about:tor. --- .../base/content/abouttbupdate/aboutTBUpdate.css | 71 ++++++++++++---------- .../base/content/abouttbupdate/aboutTBUpdate.xhtml | 26 ++++---- browser/base/content/tab-content.js | 13 +++- browser/components/nsBrowserContentHandler.js | 49 +++++++++------ .../locales/en-US/chrome/browser/aboutTBUpdate.dtd | 6 +- browser/modules/AboutTBUpdate.jsm | 67 ++++++++++++++------ 6 files changed, 147 insertions(+), 85 deletions(-) diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.css b/browser/base/content/abouttbupdate/aboutTBUpdate.css index 90252d77a739..7c1a34b77f17 100644 --- a/browser/base/content/abouttbupdate/aboutTBUpdate.css +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.css @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, The Tor Project, Inc. + * Copyright (c) 2019, The Tor Project, Inc. * See LICENSE for licensing information. * * vim: set sw=2 sts=2 ts=8 et syntax=css: @@ -12,56 +12,63 @@ body { font-family: Helvetica, Arial, sans-serif; - font-size: 110%; color: var(--abouttor-text-color); background-color: var(--abouttor-bg-toron-color); background-attachment: fixed; background-size: 100% 100%; } -#torbrowser-version { - /* These CSS rules match the about:tor page */ - position: fixed; - top: 6px; - right: 6px; - height: 30px; - width: 200px; - font-size: 15px; - white-space: pre-wrap; - text-align: right; -} - a { color: var(--abouttor-text-color); } -#logo { - background-image: url("chrome://branding/content/icon128.png"); - height: 128px; - width: 128px; - margin: 20px; - float: left; +.two-column-grid { + display: inline-grid; + grid-template-columns: auto auto; + grid-column-gap: 50px; + margin: 10px 0px 0px 50px; +} + +.two-column-grid div { + margin-top: 40px; + align-self: baseline; /* Align baseline of text across the row. */ +} + +.label-column { + font-size: 14px; + font-weight: 400; +} + +/* + * Use a reduced top margin to bring the row that contains the + * "visit our website" link closer to the row that precedes it. This + * looks better because the "visit our website" row does not have a + * label in the left column. + */ +div.more-info-row { + margin-top: 5px; + font-size: 14px; } -#msg { - margin-top: 50px; - float: left; +#version-content { + font-size: 50px; + font-weight: 300; } -#msg-updated { - font-size: 120%; - margin-bottom: 20px; +body:not([havereleasedate]) .release-date-cell { + display: none; } -#changelog-container { - margin: 0px 20px 20px 20px; +#releasedate-content { + font-size: 17px; } -#changelog-heading { - margin-bottom: 4px; +#releasenotes-label { + align-self: start; /* Anchor "Release Notes" label at the top. */ } -#changelog { - margin-left: 20px; +#releasenotes-content { + font-family: monospace; + font-size: 15px; white-space: pre; } diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml index fe8ed69b537f..f703fe1e13a1 100644 --- a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml @@ -13,24 +13,26 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>&aboutTBUpdate.title;</title> + <title>&aboutTBUpdate.changelogTitle;</title> <link rel="stylesheet" type="text/css" href="chrome://browser/content/abouttbupdate/aboutTBUpdate.css"/> <script src="chrome://browser/content/abouttbupdate/aboutTBUpdate.js" type="text/javascript"/> </head> <body dir="&locale.dir;" onload="init()"> -<div id="torbrowser-version"/> -<div id="logo"/> -<div id="msg"> -<div id="msg-updated">&aboutTBUpdate.updated;</div> -<div>&aboutTBUpdate.linkPrefix;<a id="infolink">&aboutTBUpdate.linkLabel;</a>&aboutTBUpdate.linkSuffix; -</div> -</div> -<br clear="all"/> -<div id="changelog-container"> -<div id="changelog-heading">&aboutTBUpdate.changeLogHeading;</div> -<div id="changelog"></div> +<div class="two-column-grid"> + <div class="label-column">&aboutTBUpdate.version;</div> + <div id="version-content"/> + + <div class="label-column release-date-cell">&aboutTBUpdate.releaseDate;</div> + <div id="releasedate-content" class="release-date-cell"/> + + <div class="more-info-row"/> + <div class="more-info-row">&aboutTBUpdate.linkPrefix;<a id="infolink">&aboutTBUpdate.linkLabel;</a>&aboutTBUpdate.linkSuffix;</div> + + <div id="releasenotes-label" + class="label-column">&aboutTBUpdate.releaseNotes;</div> + <div id="releasenotes-content"></div> </div> </body> </html> diff --git a/browser/base/content/tab-content.js b/browser/base/content/tab-content.js index e0cf6747aaa4..6450baa6d060 100644 --- a/browser/base/content/tab-content.js +++ b/browser/base/content/tab-content.js @@ -384,12 +384,21 @@ let AboutTBUpdateListener = { this.onUpdate(aMessage.data); }, + // aData may contain the following string properties: + // version + // releaseDate + // moreInfoURL + // releaseNotes onUpdate: function(aData) { let doc = content.document; - doc.getElementById("torbrowser-version").textContent = aData.productInfo; + doc.getElementById("version-content").textContent = aData.version; + if (aData.releaseDate) { + doc.body.setAttribute("havereleasedate", "true"); + doc.getElementById("releasedate-content").textContent = aData.releaseDate; + } if (aData.moreInfoURL) doc.getElementById("infolink").setAttribute("href", aData.moreInfoURL); - doc.getElementById("changelog").textContent = aData.changeLog; + doc.getElementById("releasenotes-content").textContent = aData.releaseNotes; }, onPageLoad: function() { diff --git a/browser/components/nsBrowserContentHandler.js b/browser/components/nsBrowserContentHandler.js index a640bfc57663..4c698a9ebd90 100644 --- a/browser/components/nsBrowserContentHandler.js +++ b/browser/components/nsBrowserContentHandler.js @@ -541,6 +541,21 @@ nsBrowserContentHandler.prototype = { } } + // Retrieve the home page early so we can compare it against about:tor + // to decide whether or not we need an override page (second tab) after + // an update was applied. + var startPage = ""; + try { + var choice = prefb.getIntPref("browser.startup.page"); + if (choice == 1 || choice == 3) + startPage = this.startPage; + } catch (e) { + Cu.reportError(e); + } + + if (startPage == "about:blank") + startPage = ""; + var override; var overridePage = ""; var additionalPage = ""; @@ -580,11 +595,14 @@ nsBrowserContentHandler.prototype = { // we may open the startPage in addition to restoring the session. // // Tor Browser: Instead of opening the post-update "override page" - // directly, an about:tbupdate page is opened that includes a link - // to the override page as well as text from the first part of the - // local ChangeLog.txt file. The override page URL comes from the - // openURL attribute within the updates.xml file or, if no showURL - // action is present, from the startup.homepage_override_url pref. + // directly, we ensure that about:tor will be opened in a special + // mode that notifies the user that their browser was updated. + // The about:tor page will provide a link to the override page + // where the user can learn more about the update, as well as a + // link to the Tor Browser changelog page (about:tbupdate). The + // override page URL comes from the openURL attribute within the + // updates.xml file or, if no showURL action is present, from the + // startup.homepage_override_url pref. var ss = Cc["@mozilla.org/browser/sessionstartup;1"] .getService(Ci.nsISessionStartup); willRestoreSession = ss.isAutomaticRestoreEnabled(); @@ -606,7 +624,14 @@ nsBrowserContentHandler.prototype = { if (overridePage) { prefb.setCharPref("torbrowser.post_update.url", overridePage); - overridePage = "about:tbupdate" + prefb.setBoolPref("torbrowser.post_update.shouldNotify", true); + // If the user's homepage is about:tor, we will inform them + // about the update on that page; otherwise, we arrange to + // open about:tor in a secondary tab. + if (startPage === "about:tor") + overridePage = ""; + else + overridePage = "about:tor"; } #endif break; @@ -636,18 +661,6 @@ nsBrowserContentHandler.prototype = { } } - var startPage = ""; - try { - var choice = prefb.getIntPref("browser.startup.page"); - if (choice == 1 || choice == 3) - startPage = this.startPage; - } catch (e) { - Cu.reportError(e); - } - - if (startPage == "about:blank") - startPage = ""; - let skipStartPage = override == OVERRIDE_NEW_PROFILE && prefb.getBoolPref("browser.startup.firstrunSkipsHomepage"); // Only show the startPage if we're not restoring an update session and are diff --git a/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd b/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd index 37567bd7e38c..2d1e59b40eaf 100644 --- a/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd +++ b/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd @@ -1,6 +1,8 @@ -<!ENTITY aboutTBUpdate.title "Tor Browser Update"> +<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Changelog"> <!ENTITY aboutTBUpdate.updated "Tor Browser has been updated."> <!ENTITY aboutTBUpdate.linkPrefix "For the most up-to-date information about this release, "> <!ENTITY aboutTBUpdate.linkLabel "visit our website"> <!ENTITY aboutTBUpdate.linkSuffix "."> -<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> +<!ENTITY aboutTBUpdate.version "Version"> +<!ENTITY aboutTBUpdate.releaseDate "Release Date"> +<!ENTITY aboutTBUpdate.releaseNotes "Release Notes"> diff --git a/browser/modules/AboutTBUpdate.jsm b/browser/modules/AboutTBUpdate.jsm index 49d9d9b0e18d..4d18d2980a6c 100644 --- a/browser/modules/AboutTBUpdate.jsm +++ b/browser/modules/AboutTBUpdate.jsm @@ -40,10 +40,8 @@ var AboutTBUpdate = { }, sendAboutTBUpdateData: function(aTarget) { - let data = { productInfo: this.productInfo, - moreInfoURL: this.moreInfoURL, - changeLog: this.changeLog }; - + let data = this.releaseNoteInfo; + data.moreInfoURL = this.moreInfoURL; if (aTarget && aTarget.messageManager) { aTarget.messageManager.sendAsyncMessage(kSendUpdateMessageName, data); } else { @@ -53,15 +51,6 @@ var AboutTBUpdate = { } }, - get productInfo() { - const kBrandBundle = "chrome://branding/locale/brand.properties"; - let brandBundle = Cc["@mozilla.org/intl/stringbundle;1"] - .getService(Ci.nsIStringBundleService) - .createBundle(kBrandBundle); - return brandBundle.GetStringFromName("brandFullName") - + "\n" + TOR_BROWSER_VERSION; - }, - get moreInfoURL() { try { return Services.prefs.getCharPref("torbrowser.post_update.url"); @@ -71,12 +60,22 @@ var AboutTBUpdate = { return Services.urlFormatter.formatURLPref("startup.homepage_override_url"); }, - // Read and return the text from the beginning of the changelog file that is - // located at TorBrowser/Docs/ChangeLog.txt. + // Read the text from the beginning of the changelog file that is located + // at TorBrowser/Docs/ChangeLog.txt and return an object that contains + // the following properties: + // version e.g., Tor Browser 8.5 + // releaseDate e.g., March 31 2019 + // releaseNotes details of changes (lines 2 - end of ChangeLog.txt) + // We attempt to parse the first line of ChangeLog.txt to extract the + // version and releaseDate. If parsing fails, we return the entire first + // line in version and omit releaseDate. + // // On Mac OS, when building with --enable-tor-browser-data-outside-app-dir - // to support Gatekeeper signing, the file is located in + // to support Gatekeeper signing, the ChangeLog.txt file is located in // TorBrowser.app/Contents/Resources/TorBrowser/Docs/. - get changeLog() { + get releaseNoteInfo() { + let info = {}; + try { #ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR // "XREExeF".parent is the directory that contains firefox, i.e., @@ -103,9 +102,39 @@ var AboutTBUpdate = { fs.close(); // Truncate at the first empty line. - return s.replace(/[\r\n][\r\n][\s\S]*$/m, ""); + s = s.replace(/[\r\n][\r\n][\s\S]*$/m, ""); + + // Split into first line (version plus releaseDate) and + // remainder (releaseNotes). + // This first match() uses multiline mode with two capture groups: + // first line: (.*$) + // remaining lines: ([\s\S]+) + // [\s\S] matches all characters including end of line. This trick + // is needed because when using JavaScript regex in multiline mode, + // . does not match an end of line character. + let matchArray = s.match(/(.*$)\s*([\s\S]+)/m); + if (matchArray && (matchArray.length == 3)) { + info.releaseNotes = matchArray[2]; + let line1 = matchArray[1]; + // Extract the version and releaseDate. The first line looks like: + // Tor Browser 8.5 -- May 1 2019 + // The regex uses two capture groups: + // text that does not include a hyphen: (^[^-]*) + // remaining text: (.*$) + // In between we match optional whitespace, one or more hyphens, and + // optional whitespace by using: \s*-+\s* + matchArray = line1.match(/(^[^-]*)\s*-+\s*(.*$)/); + if (matchArray && (matchArray.length == 3)) { + info.version = matchArray[1]; + info.releaseDate = matchArray[2]; + } else { + info.version = line1; // Match failed: return entire line in version. + } + } else { + info.releaseNotes = s; // Only one line: use as releaseNotes. + } } catch (e) {} - return ""; + return info; }, };

1 0

[torspec/master] Proposal 301: Don't include package fingerprints in consensus documents
by ahf＠torproject.org 13 Mar '19

13 Mar '19

commit 300d66200e6778baba68c12cea03a7e8d8dc7076 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Mar 13 15:50:47 2019 +0100 Proposal 301: Don't include package fingerprints in consensus documents --- proposals/000-index.txt | 2 + .../301-dont-vote-on-package-fingerprints.txt | 73 ++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 7cc5806..36cfe4b 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -221,6 +221,7 @@ Proposals by number: 298 Putting family lines in canonical form [CLOSED] 299 Preferring IPv4 or IPv6 based on IP Version Failure Count [OPEN] 300 Walking Onions: Scaling and Saving Bandwidth [DRAFT] +301 Don't include package fingerprints in consensus documents [OPEN] Proposals by status: @@ -253,6 +254,7 @@ Proposals by status: 295 Using ADL for relay cryptography (solving the crypto-tagging attack) 296 Have Directory Authorities expose raw bandwidth list files 299 Preferring IPv4 or IPv6 based on IP Version Failure Count + 301 Don't include package fingerprints in consensus documents ACCEPTED: 188 Bridge Guards and other anti-enumeration defenses 249 Allow CREATE cells with >505 bytes of handshake data diff --git a/proposals/301-dont-vote-on-package-fingerprints.txt b/proposals/301-dont-vote-on-package-fingerprints.txt new file mode 100644 index 0000000..8e8b63a --- /dev/null +++ b/proposals/301-dont-vote-on-package-fingerprints.txt @@ -0,0 +1,73 @@ +Filename: 301-dont-vote-on-package-fingerprints.txt +Title: Don't include package fingerprints in consensus documents +Author: Iain R. Learmonth +Created: 2019-02-21 +Status: Open +Ticket: #28465 + +0. Abstract + + I propose modifying the Tor consensus document to remove + digests of the latest versions of package files. These "package" + lines were never used by any directory authority and so add + additional complexity to the consensus voting mechanisms while + adding no additional value. + +1. Introduction + + In proposal 227 [1], to improve the integrity and security of + updates, a way to authenticate the latest versions of core Tor + software through the consensus was described. By listing a location + with this information for each version of each package, we can + augment the update process of Tor software to authenticate the + packages it downloads through the Tor consensus. This was + implemented in tor 0.2.6.3-alpha. + + When looking at modernising our network archive recently [2], I + came across this line for votes and consensuses. If packages are + referenced by the consensus then ideally we should archive those + packages just as we archive referenced descriptors. However, this + line was never present in any vote archived. + +2. Proposal + + We deprecate the "package" line in the specification for votes. + + Directory authorities stop voting for "package" lines in their + votes. Changes to votes do not require a new consensus method, so + this part of the proposal can be implemented separately. + + We allocate a consensus method when this proposal is implemented. + Let's call it consensus method N. + + Authorities will continue computing consensus package lines in the + consensus if the consensus method is between 19 and (N-1). If the + consensus method is N or later, they omit these lines. + +3. Security Considerations + + This proposal removes a feature that could be used for improved + security but currently isn't. As such it is extra code in the + codebase that may have unknown bugs or lead to bugs in the future + due to unexpected interactions. Overall this should be a good + thing for security of Core Tor. + +4. Compatability Considerations + + A new consensus method is required for this proposal. The + "package" line was always optional and so no client should be + depending on it. There are no known consumers of the "package" + lines (there are none to consume anyway). + +A. References + + [1] Nick Mathewson, Mike Perry. "Include package fingerprints in + consensus documents". Tor Proposal 227, February 2014. + [2] Iain Learmonth, Karsten Loesing. "Towards modernising data + collection and archive for the Tor network". Technical Report + 2018-12-001, December 2018. + +B. Acknowledgements + + Thanks to teor and Nick Mathewson for their comments and + suggestions on this proposal.

1 0

[translation/donatepages-messagespot_completed] Update translations for donatepages-messagespot_completed
by translation＠torproject.org 13 Mar '19

13 Mar '19

commit 535659d8d5bbe9fd5134c28a575aaa0377b703df Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 13 14:45:38 2019 +0000 Update translations for donatepages-messagespot_completed --- locale/tr/LC_MESSAGES/messages.po | 55 ++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/locale/tr/LC_MESSAGES/messages.po b/locale/tr/LC_MESSAGES/messages.po index a94ff7771..ab7155ebc 100644 --- a/locale/tr/LC_MESSAGES/messages.po +++ b/locale/tr/LC_MESSAGES/messages.po @@ -6,10 +6,10 @@ # psiphon3 <psiphon3(a)gmail.com>, 2018 # erinm, 2018 # Alperen Kitapçı <alperenmirac(a)gmail.com>, 2019 -# Kaya Zeren <kayazeren(a)gmail.com>, 2019 # Arda Büyükkaya <ardabuyukkaya(a)protonmail.com>, 2019 # cenk y. <goncagul(a)national.shitposting.agency>, 2019 # Lale Fatoş Tunçman <latuna63(a)gmail.com>, 2019 +# Kaya Zeren <kayazeren(a)gmail.com>, 2019 # Taha Karadoğan <tahakaradogan(a)gmail.com>, 2019 # Hasan Tayyar BESIK <tayyar.besik(a)gmail.com>, 2019 # Tmp341, 2019 @@ -782,14 +782,15 @@ msgid "" "inquiries, or <span class=\"email\">giving(at)torproject.org</span> with " "donor-specific questions." msgstr "" -"Aşağıda sorunuz yanıtlanmamışsa, genel Tor isteklerinizi <span " -"class=\"email\">frontdesk(at)rt.torproject.org</span> veya bağışa ilişkin " -"özel sorularınızı<span class=\"email\">giving(at)torproject.org</span> " -"adresine e-posta gönderiniz." +"Sorunuz aşağıda yanıtlanmamış ise, Tor hakkındaki genel sorularınızı <span " +"class=\"email\">frontdesk(at)rt.torproject.org</span> adresine, bağış " +"yapmakla ilgili sorularınızı <span " +"class=\"email\">giving(at)torproject.org</span> adresine e-posta ile " +"gönderebilirsiniz." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:66 msgid "What is the Tor Project and what does it do?" -msgstr "Tor Projesi nedir ve ne işe yarar?" +msgstr "Tor Projesi nedir ve ne yapar?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:70 msgid "" @@ -798,10 +799,10 @@ msgid "" "supporting their unrestricted availability and use, and furthering their " "scientific and popular understanding." msgstr "" -" Tor Projesi'nin’s görevi, bilimsel ve genel anlayışlarını " -"ilerleterek, sınırsız erişilebilirliklerini ve kullanımlarını destekleyerek," -" açık ve özgür bilinmezliği ve mahrumiyet teknolojilerini yaratarak ve " -"uygulayarak, insan haklarını ve özgürlüklerini ileri düzeye taşımaktır. " +"Tor Projesinin misyonu, özgür ve açık kaynaklı anonimlik ve kişisel gizlilik" +" teknolojileri geliştirerek insan hakları ve özgürlüklerini ileriye " +"götürmek, bu teknolojilerin bilimsel ve kültürel olarak bilinirliğini " +"arttırmak ve herkes tarafından erişebilmesini sağlamaktır." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:72 msgid "" @@ -809,25 +810,25 @@ msgid "" "href=\"https://www.torproject.org/download/download-easy.html.en\">Tor " "Browser</a>, which enables people to browse the internet anonymously." msgstr "" -"Tor Projesi'nin ana ürünü insanların internette gizlice dolaşmasına imkan " -"sağlayan <a href=\"https://www.torproject.org/download/download-" -"easy.html.en\">Tor Browser'dır</a>." +"Tor Projesinin ana ürünü olan <a href=\"https://www.torproject.org/download" +"/download-easy.html.en\">Tor Browser</a> insanların İnternet üzerinde anonim" +" kalarak dolaşabilmesini sağlar." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:74 msgid "" "The Tor Project is a 501(c)3 tax-exempt non-profit organization based in " "Boston, Massachusetts." msgstr "" -"Tor Projesi Milli Gelirler Yasası 501(c)3 maddesine göre vergiden muaf, " -"Boston, Massachusetts merkezli kar amacı gütmeyen bir kuruluştur." +"Tor Projesi 501(c)3 vergi muafiyeti maddesinden yararlanan ve kar amacı " +"gütmeyen Boston, Massachusetts merkezli bir kuruluştur." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:76 msgid "It was founded in 2006." -msgstr "2006'da kurulmuştur." +msgstr "2006 yılında kurulmuştur." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:82 msgid "Who works for the Tor Project, and what do they do?" -msgstr "Tor Projesi için kim çalışıyor ve ne yapıyorlar?" +msgstr "Tor Projesinin çalışanları kimlerdir ve ne yaparlar?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:86 msgid "" @@ -836,17 +837,17 @@ msgid "" "cryptographers, computer scientists, and privacy advocates, and most are not" " paid by the Tor Project." msgstr "" -"Dünyanın dört bir yanındaki binlerce insan, geliştiriciler, tasarımcılar, " -"aktarıcı hizmeti sağlayanlar, araştırmacılar, kriptograflar, bilgisayar " -"bilimcileri ve gizlilik savunucuları dahil olmak üzere Tor Projesinin " -"çalışmalarını aktif olarak destekliyor ve çoğu Tor Projesi tarafından " -"ödenmiyor." +"Dünyanın dört bir yanından geliştiriciler, tasarımcılar, aktarıcı " +"işletenler, araştırmacılar, şifreleme uzmanları, bilgisayar bilimcileri ve " +"gizlilik savunucuları gibi binlerce insan Tor Projesinin çalışmalarını etkin" +" olarak destekliyor ve çoğuna Tor Projesi tarafından herhangi bir ödeme " +"yapılmıyor." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:88 msgid "" "The paid staff of the Tor Project is very small: about 47 people in total." msgstr "" -"Tor Projesi'nin ücretli personeli çok azdır: toplamda yaklaşık 47 kişi." +"Tor Projesinin ücretli çalışan sayısı çok azdır: toplam 47 kişi civarında." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:90 msgid "" @@ -855,14 +856,14 @@ msgid "" "href=\"https://www.torproject.org/about/corepeople.html.en\"><span " "class=\"links\">Core People page</span></a>." msgstr "" -"Tor Projesine katkıda bulunanlar hakkında bilgiyi <a class=\"hyperlinks\" " -"target=\"_blank\" " +"Tor Projesinin temel katılımcıları hakkında bilgi almak için <a " +"class=\"hyperlinks\" target=\"_blank\" " "href=\"https://www.torproject.org/about/corepeople.html.en\"><span " -"class=\"links\">Çekirden Tor Kişileri sayfası</span></a>nda bulabilirsiniz." +"class=\"links\">Çekirdek Tor Ekibi</span></a> bölümüne bakabilirsiniz." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:95 msgid "Who uses Tor?" -msgstr "Tor'u kim kullanır?" +msgstr "Kimler Tor kullanır?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:99 msgid ""

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 13 Mar '19

13 Mar '19

commit d1d6aceb30c69d106da542268ce09157308f6679 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 13 14:45:31 2019 +0000 Update translations for donatepages-messagespot --- locale/tr/LC_MESSAGES/messages.po | 55 ++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/locale/tr/LC_MESSAGES/messages.po b/locale/tr/LC_MESSAGES/messages.po index a94ff7771..ab7155ebc 100644 --- a/locale/tr/LC_MESSAGES/messages.po +++ b/locale/tr/LC_MESSAGES/messages.po @@ -6,10 +6,10 @@ # psiphon3 <psiphon3(a)gmail.com>, 2018 # erinm, 2018 # Alperen Kitapçı <alperenmirac(a)gmail.com>, 2019 -# Kaya Zeren <kayazeren(a)gmail.com>, 2019 # Arda Büyükkaya <ardabuyukkaya(a)protonmail.com>, 2019 # cenk y. <goncagul(a)national.shitposting.agency>, 2019 # Lale Fatoş Tunçman <latuna63(a)gmail.com>, 2019 +# Kaya Zeren <kayazeren(a)gmail.com>, 2019 # Taha Karadoğan <tahakaradogan(a)gmail.com>, 2019 # Hasan Tayyar BESIK <tayyar.besik(a)gmail.com>, 2019 # Tmp341, 2019 @@ -782,14 +782,15 @@ msgid "" "inquiries, or <span class=\"email\">giving(at)torproject.org</span> with " "donor-specific questions." msgstr "" -"Aşağıda sorunuz yanıtlanmamışsa, genel Tor isteklerinizi <span " -"class=\"email\">frontdesk(at)rt.torproject.org</span> veya bağışa ilişkin " -"özel sorularınızı<span class=\"email\">giving(at)torproject.org</span> " -"adresine e-posta gönderiniz." +"Sorunuz aşağıda yanıtlanmamış ise, Tor hakkındaki genel sorularınızı <span " +"class=\"email\">frontdesk(at)rt.torproject.org</span> adresine, bağış " +"yapmakla ilgili sorularınızı <span " +"class=\"email\">giving(at)torproject.org</span> adresine e-posta ile " +"gönderebilirsiniz." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:66 msgid "What is the Tor Project and what does it do?" -msgstr "Tor Projesi nedir ve ne işe yarar?" +msgstr "Tor Projesi nedir ve ne yapar?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:70 msgid "" @@ -798,10 +799,10 @@ msgid "" "supporting their unrestricted availability and use, and furthering their " "scientific and popular understanding." msgstr "" -" Tor Projesi'nin’s görevi, bilimsel ve genel anlayışlarını " -"ilerleterek, sınırsız erişilebilirliklerini ve kullanımlarını destekleyerek," -" açık ve özgür bilinmezliği ve mahrumiyet teknolojilerini yaratarak ve " -"uygulayarak, insan haklarını ve özgürlüklerini ileri düzeye taşımaktır. " +"Tor Projesinin misyonu, özgür ve açık kaynaklı anonimlik ve kişisel gizlilik" +" teknolojileri geliştirerek insan hakları ve özgürlüklerini ileriye " +"götürmek, bu teknolojilerin bilimsel ve kültürel olarak bilinirliğini " +"arttırmak ve herkes tarafından erişebilmesini sağlamaktır." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:72 msgid "" @@ -809,25 +810,25 @@ msgid "" "href=\"https://www.torproject.org/download/download-easy.html.en\">Tor " "Browser</a>, which enables people to browse the internet anonymously." msgstr "" -"Tor Projesi'nin ana ürünü insanların internette gizlice dolaşmasına imkan " -"sağlayan <a href=\"https://www.torproject.org/download/download-" -"easy.html.en\">Tor Browser'dır</a>." +"Tor Projesinin ana ürünü olan <a href=\"https://www.torproject.org/download" +"/download-easy.html.en\">Tor Browser</a> insanların İnternet üzerinde anonim" +" kalarak dolaşabilmesini sağlar." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:74 msgid "" "The Tor Project is a 501(c)3 tax-exempt non-profit organization based in " "Boston, Massachusetts." msgstr "" -"Tor Projesi Milli Gelirler Yasası 501(c)3 maddesine göre vergiden muaf, " -"Boston, Massachusetts merkezli kar amacı gütmeyen bir kuruluştur." +"Tor Projesi 501(c)3 vergi muafiyeti maddesinden yararlanan ve kar amacı " +"gütmeyen Boston, Massachusetts merkezli bir kuruluştur." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:76 msgid "It was founded in 2006." -msgstr "2006'da kurulmuştur." +msgstr "2006 yılında kurulmuştur." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:82 msgid "Who works for the Tor Project, and what do they do?" -msgstr "Tor Projesi için kim çalışıyor ve ne yapıyorlar?" +msgstr "Tor Projesinin çalışanları kimlerdir ve ne yaparlar?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:86 msgid "" @@ -836,17 +837,17 @@ msgid "" "cryptographers, computer scientists, and privacy advocates, and most are not" " paid by the Tor Project." msgstr "" -"Dünyanın dört bir yanındaki binlerce insan, geliştiriciler, tasarımcılar, " -"aktarıcı hizmeti sağlayanlar, araştırmacılar, kriptograflar, bilgisayar " -"bilimcileri ve gizlilik savunucuları dahil olmak üzere Tor Projesinin " -"çalışmalarını aktif olarak destekliyor ve çoğu Tor Projesi tarafından " -"ödenmiyor." +"Dünyanın dört bir yanından geliştiriciler, tasarımcılar, aktarıcı " +"işletenler, araştırmacılar, şifreleme uzmanları, bilgisayar bilimcileri ve " +"gizlilik savunucuları gibi binlerce insan Tor Projesinin çalışmalarını etkin" +" olarak destekliyor ve çoğuna Tor Projesi tarafından herhangi bir ödeme " +"yapılmıyor." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:88 msgid "" "The paid staff of the Tor Project is very small: about 47 people in total." msgstr "" -"Tor Projesi'nin ücretli personeli çok azdır: toplamda yaklaşık 47 kişi." +"Tor Projesinin ücretli çalışan sayısı çok azdır: toplam 47 kişi civarında." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:90 msgid "" @@ -855,14 +856,14 @@ msgid "" "href=\"https://www.torproject.org/about/corepeople.html.en\"><span " "class=\"links\">Core People page</span></a>." msgstr "" -"Tor Projesine katkıda bulunanlar hakkında bilgiyi <a class=\"hyperlinks\" " -"target=\"_blank\" " +"Tor Projesinin temel katılımcıları hakkında bilgi almak için <a " +"class=\"hyperlinks\" target=\"_blank\" " "href=\"https://www.torproject.org/about/corepeople.html.en\"><span " -"class=\"links\">Çekirden Tor Kişileri sayfası</span></a>nda bulabilirsiniz." +"class=\"links\">Çekirdek Tor Ekibi</span></a> bölümüne bakabilirsiniz." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:95 msgid "Who uses Tor?" -msgstr "Tor'u kim kullanır?" +msgstr "Kimler Tor kullanır?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:99 msgid ""

1 0

[tor/master] Fix test prob distr parameters that caused warnings.
by nickm＠torproject.org 13 Mar '19

13 Mar '19

commit a71999462b8d185c70169c4cba3efde6e55393ce Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Feb 25 14:59:28 2019 +0200 Fix test prob distr parameters that caused warnings. They were causing the following warnings in circuitpadding/circuitpadding_sample_distribution: src/lib/math/prob_distr.c:1311:17: runtime error: division by zero SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior src/lib/math/prob_distr.c:1311:17 in src/lib/math/prob_distr.c:1219:49: runtime error: division by zero SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior src/lib/math/prob_distr.c:1219:49 in because the distributions were called with erroneous parameters (e.g. geometric distribution with p=0). We now defined these test probability distributions with more realistic parameters. As far as the circuitpadding_sample_distribution() test is concerned, it doesn't matter if the distributions return values outside of [0,10] since we already restrict the values into that interval using min=0 and max=10 (and RTT estimate is disabled). --- src/core/or/circuitpadding.c | 7 +++++-- src/core/or/circuitpadding.h | 11 ++++++++++- src/test/test_circuitpadding.c | 30 ++++++++++++++++-------------- 3 files changed, 31 insertions(+), 17 deletions(-) diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c index b7e4b5684..9e8790277 100644 --- a/src/core/or/circuitpadding.c +++ b/src/core/or/circuitpadding.c @@ -389,11 +389,14 @@ circpad_distribution_sample_iat_delay(const circpad_state_t *state, double val = circpad_distribution_sample(state->iat_dist); /* These comparisons are safe, because the output is in the range * [0, 2**32), and double has a precision of 53 bits. */ + /* We want a positive sample value */ val = MAX(0, val); + /* Respect the maximum sample setting */ val = MIN(val, state->dist_max_sample_usec); - /* This addition is exact: val is at most 2**32-1, min_delay - * is at most 2**32-1, and doubles have a precision of 53 bits. */ + /* Now apply the shift: + * This addition is exact: val is at most 2**32-1, delay_shift is at most + * 2**32-1, and doubles have a precision of 53 bits. */ val += delay_shift; /* Clamp the distribution at infinite delay val */ diff --git a/src/core/or/circuitpadding.h b/src/core/or/circuitpadding.h index 74f9f35c9..fefdf2ba9 100644 --- a/src/core/or/circuitpadding.h +++ b/src/core/or/circuitpadding.h @@ -198,14 +198,23 @@ typedef enum { * These can be used instead of histograms for the inter-packet * timing distribution, or to specify a distribution on the number * of cells that can be sent while in a specific state of the state - * machine. */ + * machine. + * + * Each distribution takes up to two parameters which are described below. */ typedef enum { + /* No probability distribution is used */ CIRCPAD_DIST_NONE = 0, + /* Uniform distribution: param1 is lower bound and param2 is upper bound */ CIRCPAD_DIST_UNIFORM = 1, + /* Logistic distribution: param1 is Mu, param2 is sigma. */ CIRCPAD_DIST_LOGISTIC = 2, + /* Log-logistic distribution: param1 is Alpha, param2 is 1.0/Beta */ CIRCPAD_DIST_LOG_LOGISTIC = 3, + /* Geometric distribution: param1 is 'p' (success probability) */ CIRCPAD_DIST_GEOMETRIC = 4, + /* Weibull distribution: param1 is k, param2 is Lambda */ CIRCPAD_DIST_WEIBULL = 5, + /* Generalized Pareto distribution: param1 is sigma, param2 is xi */ CIRCPAD_DIST_PARETO = 6 } circpad_distribution_type_t; diff --git a/src/test/test_circuitpadding.c b/src/test/test_circuitpadding.c index 3570b179b..d349a4d3c 100644 --- a/src/test/test_circuitpadding.c +++ b/src/test/test_circuitpadding.c @@ -2096,6 +2096,7 @@ helper_circpad_circ_distribution_machine_setup(int min, int max) circpad_state_t *zero_st = &circ_client_machine.states[0]; zero_st->next_state[CIRCPAD_EVENT_NONPADDING_RECV] = 1; zero_st->iat_dist.type = CIRCPAD_DIST_UNIFORM; + /* param2 is upper bound, param1 is lower */ zero_st->iat_dist.param1 = min; zero_st->iat_dist.param2 = max; zero_st->dist_added_shift_usec = min; @@ -2104,48 +2105,50 @@ helper_circpad_circ_distribution_machine_setup(int min, int max) circpad_state_t *first_st = &circ_client_machine.states[1]; first_st->next_state[CIRCPAD_EVENT_NONPADDING_RECV] = 2; first_st->iat_dist.type = CIRCPAD_DIST_LOGISTIC; - first_st->iat_dist.param1 = min; - first_st->iat_dist.param2 = max; + /* param1 is Mu, param2 is sigma. */ + first_st->iat_dist.param1 = 9; + first_st->iat_dist.param2 = 3; first_st->dist_added_shift_usec = min; first_st->dist_max_sample_usec = max; circpad_state_t *second_st = &circ_client_machine.states[2]; second_st->next_state[CIRCPAD_EVENT_NONPADDING_RECV] = 3; second_st->iat_dist.type = CIRCPAD_DIST_LOG_LOGISTIC; - second_st->iat_dist.param1 = min; - second_st->iat_dist.param2 = max; + /* param1 is Alpha, param2 is 1.0/Beta */ + second_st->iat_dist.param1 = 1; + second_st->iat_dist.param2 = 0.5; second_st->dist_added_shift_usec = min; second_st->dist_max_sample_usec = max; circpad_state_t *third_st = &circ_client_machine.states[3]; third_st->next_state[CIRCPAD_EVENT_NONPADDING_RECV] = 4; third_st->iat_dist.type = CIRCPAD_DIST_GEOMETRIC; - third_st->iat_dist.param1 = min; - third_st->iat_dist.param2 = max; + /* param1 is 'p' (success probability) */ + third_st->iat_dist.param1 = 0.2; third_st->dist_added_shift_usec = min; third_st->dist_max_sample_usec = max; circpad_state_t *fourth_st = &circ_client_machine.states[4]; fourth_st->next_state[CIRCPAD_EVENT_NONPADDING_RECV] = 5; fourth_st->iat_dist.type = CIRCPAD_DIST_WEIBULL; - fourth_st->iat_dist.param1 = min; - fourth_st->iat_dist.param2 = max; + /* param1 is k, param2 is Lambda */ + fourth_st->iat_dist.param1 = 1.5; + fourth_st->iat_dist.param2 = 1; fourth_st->dist_added_shift_usec = min; fourth_st->dist_max_sample_usec = max; circpad_state_t *fifth_st = &circ_client_machine.states[5]; fifth_st->next_state[CIRCPAD_EVENT_NONPADDING_RECV] = 6; fifth_st->iat_dist.type = CIRCPAD_DIST_PARETO; - fifth_st->iat_dist.param1 = min; - fifth_st->iat_dist.param2 = max; + /* param1 is sigma, param2 is xi */ + fifth_st->iat_dist.param1 = 1; + fifth_st->iat_dist.param2 = 5; fifth_st->dist_added_shift_usec = min; fifth_st->dist_max_sample_usec = max; } /** Simple test that the padding delays sampled from a uniform distribution * actually faill within the uniform distribution range. */ -/* TODO: Upgrade this test so that each state tests a different prob - * distribution */ static void test_circuitpadding_sample_distribution(void *arg) { @@ -2159,8 +2162,7 @@ test_circuitpadding_sample_distribution(void *arg) MOCK(circpad_machine_schedule_padding, circpad_machine_schedule_padding_mock); - /* Initialize a machine with multiple probability distributions that should - * return values between 0 and 5 */ + /* Initialize a machine with multiple probability distributions */ circpad_machines_init(); helper_circpad_circ_distribution_machine_setup(0, 10);

1 0

[tor/master] Silence unneeded clang warns that triggered in prob distr tests.
by nickm＠torproject.org 13 Mar '19

13 Mar '19

commit 8b64ff7a3f2d9eb0837248a6c9b0e8b438374369 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Feb 25 15:29:41 2019 +0200 Silence unneeded clang warns that triggered in prob distr tests. See https://trac.torproject.org/projects/tor/ticket/29528#comment:3 and https://bugs.llvm.org/show_bug.cgi?id=19535 --- configure.ac | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac index 75bb0c7bd..8f0563753 100644 --- a/configure.ac +++ b/configure.ac @@ -1196,6 +1196,11 @@ if test "$fragile_hardening" = "yes"; then AC_MSG_ERROR([The compiler supports -fsanitize=undefined, but for some reason I was not able to link when using it. Are you missing run-time support? With GCC you need libasan.*, and with Clang you need libclang_rt.ubsan*]) fi + TOR_TRY_COMPILE_WITH_CFLAGS([-fno-sanitize=float-divide-by-zero], also_link, CFLAGS_UBSAN="-fno-sanitize=float-divide-by-zero", true) + if test "$tor_cv_cflags__fno_sanitize_float_divide_by_zero" = "yes" && test "$tor_can_link__fno_sanitize_float_divide_by_zero" != "yes"; then + AC_MSG_ERROR([The compiler supports -fno-sanitize=float-divide-by-zero, but for some reason I was not able to link when using it. Are you missing run-time support? With GCC you need libasan.*, and with Clang you need libclang_rt.ubsan*]) + fi + TOR_CHECK_CFLAGS([-fno-omit-frame-pointer]) fi

1 0