- tor-commits - lists.torproject.org

[tor-browser-build/master] Bug 33113: Bump NSIS version to 3.05
by sysrqb＠torproject.org 15 May '20

15 May '20

commit c6ef475b9388e935d77722a4d5fec860b372a6a5 Author: Georg Koppen <gk(a)torproject.org> Date: Sat May 2 09:36:54 2020 +0000 Bug 33113: Bump NSIS version to 3.05 --- projects/nsis/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/nsis/config b/projects/nsis/config index 0e6f7ad..ed9823d 100644 --- a/projects/nsis/config +++ b/projects/nsis/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 3.04 +version: 3.05 filename: 'nsis-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: container: @@ -16,7 +16,7 @@ input_files: - project: container-image - filename: 'nsis-[% c("version") %].tar.bz2' URL: 'https://downloads.sourceforge.net/nsis/nsis-[% c("version") %]-src.tar.bz2' - sha256sum: 609536046c50f35cfd909dd7df2ab38f2e835d0da3c1048aa0d48c59c5a4f4f5 + sha256sum: b6e1b309ab907086c6797618ab2879cb95387ec144dab36656b0b5fb77e97ce9 - filename: no-insert-timestamp.patch - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]'

1 0

[tor-browser/tor-browser-68.8.0esr-9.5-1] (ESR68) Bug 1511941 - Don't expose PerformanceNavigationTiming in RFP mode
by sysrqb＠torproject.org 15 May '20

15 May '20

commit 6d7f6ea31a7629d3df6fd09fc579b5a60e599c35 Author: sanketh <sgmenda(a)uwaterloo.ca> Date: Sun May 10 16:50:41 2020 +0000 (ESR68) Bug 1511941 - Don't expose PerformanceNavigationTiming in RFP mode In RFP mode, we do not support PerformanceNavigationTiming, so don't expose it. In particular, window.PerformanceNavigationTiming should return undefined. Added a new method PerformanceNavigationTiming::Enabled which when used with the WebIDL Func attribute allows us to toggle whether window.PerformanceNavigationTiming is exposed. Created dom/tests/mochitest/general/test_toggling_performance_navigation_timing.html to test whether the toggling works. Updated browser/components/resistfingerprinting/test/browser/browser_performanceAPI.js to create a new window each time privacy.resistFingerprinting is flipped so this behavior does not leak into other tests. --- .../test/browser/browser_performanceAPI.js | 62 ++++++++-------------- dom/performance/PerformanceMainThread.cpp | 3 +- dom/performance/PerformanceNavigationTiming.cpp | 6 +++ dom/performance/PerformanceNavigationTiming.h | 6 +++ dom/tests/mochitest/general/mochitest.ini | 1 + ...est_toggling_performance_navigation_timing.html | 47 ++++++++++++++++ dom/webidl/PerformanceNavigationTiming.webidl | 2 + 7 files changed, 85 insertions(+), 42 deletions(-) diff --git a/browser/components/resistfingerprinting/test/browser/browser_performanceAPI.js b/browser/components/resistfingerprinting/test/browser/browser_performanceAPI.js index b4c6b4f9d461..eb51a98e7364 100644 --- a/browser/components/resistfingerprinting/test/browser/browser_performanceAPI.js +++ b/browser/components/resistfingerprinting/test/browser/browser_performanceAPI.js @@ -78,7 +78,6 @@ let isRounded = (x, expectedPrecision) => { }; let setupTest = async function( - tab, resistFingerprinting, reduceTimerPrecision, expectedPrecision, @@ -95,6 +94,13 @@ let setupTest = async function( ], ], }); + + let win = await BrowserTestUtils.openNewBrowserWindow(); + let tab = await BrowserTestUtils.openNewForegroundTab( + win.gBrowser, + TEST_PATH + "file_dummy.html" + ); + // No matter what we set the precision to, if we're in ResistFingerprinting mode // we use the larger of the precision pref and the constant 100ms if (resistFingerprinting) { @@ -110,15 +116,11 @@ let setupTest = async function( }, runTests ); + await BrowserTestUtils.closeWindow(win); }; // ================================================================================================ // ================================================================================================ add_task(async function runRPTests() { - let tab = await BrowserTestUtils.openNewForegroundTab( - gBrowser, - TEST_PATH + "file_dummy.html" - ); - let runTests = async function(data) { let timerlist = data.list; let expectedPrecision = data.precision; @@ -165,21 +167,14 @@ add_task(async function runRPTests() { ); }; - await setupTest(tab, true, true, 100, runTests); - await setupTest(tab, true, false, 13, runTests); - await setupTest(tab, true, false, 0.13, runTests); - - BrowserTestUtils.removeTab(tab); + await setupTest(true, true, 100, runTests); + await setupTest(true, false, 13, runTests); + await setupTest(true, false, 0.13, runTests); }); // ================================================================================================ // ================================================================================================ add_task(async function runRTPTests() { - let tab = await BrowserTestUtils.openNewForegroundTab( - gBrowser, - TEST_PATH + "file_dummy.html" - ); - let runTests = async function(data) { let timerlist = data.list; let expectedPrecision = data.precision; @@ -215,6 +210,7 @@ add_task(async function runRTPTests() { content.performance.getEntries().length, 4, "For reduceTimerPrecision, there should be 4 entries for performance.getEntries()" + // PerformanceNavigationTiming, PerformanceMark, PerformanceMark, PerformanceMeasure ); for (var i = 0; i < 4; i++) { let startTime = content.performance.getEntries()[i].startTime; @@ -253,11 +249,9 @@ add_task(async function runRTPTests() { content.performance.clearResourceTimings(); }; - await setupTest(tab, false, true, 100, runTests); - await setupTest(tab, false, true, 13, runTests); - await setupTest(tab, false, true, 0.13, runTests); - - BrowserTestUtils.removeTab(tab); + await setupTest(false, true, 100, runTests); + await setupTest(false, true, 13, runTests); + await setupTest(false, true, 0.13, runTests); }); // ================================================================================================ @@ -284,27 +278,13 @@ let runWorkerTest = async function(data) { }; add_task(async function runRPTestsForWorker() { - let tab = await BrowserTestUtils.openNewForegroundTab( - gBrowser, - TEST_PATH + "file_dummy.html" - ); - - await setupTest(tab, true, true, 100, runWorkerTest, "runRPTests"); - await setupTest(tab, true, false, 13, runWorkerTest, "runRPTests"); - await setupTest(tab, true, true, 0.13, runWorkerTest, "runRPTests"); - - BrowserTestUtils.removeTab(tab); + await setupTest(true, true, 100, runWorkerTest, "runRPTests"); + await setupTest(true, false, 13, runWorkerTest, "runRPTests"); + await setupTest(true, true, 0.13, runWorkerTest, "runRPTests"); }); add_task(async function runRTPTestsForWorker() { - let tab = await BrowserTestUtils.openNewForegroundTab( - gBrowser, - TEST_PATH + "file_dummy.html" - ); - - await setupTest(tab, false, true, 100, runWorkerTest, "runRTPTests"); - await setupTest(tab, false, true, 13, runWorkerTest, "runRTPTests"); - await setupTest(tab, false, true, 0.13, runWorkerTest, "runRTPTests"); - - BrowserTestUtils.removeTab(tab); + await setupTest(false, true, 100, runWorkerTest, "runRTPTests"); + await setupTest(false, true, 13, runWorkerTest, "runRTPTests"); + await setupTest(false, true, 0.13, runWorkerTest, "runRTPTests"); }); diff --git a/dom/performance/PerformanceMainThread.cpp b/dom/performance/PerformanceMainThread.cpp index 7c39b9350646..bfcbea4e1148 100644 --- a/dom/performance/PerformanceMainThread.cpp +++ b/dom/performance/PerformanceMainThread.cpp @@ -305,7 +305,8 @@ DOMHighResTimeStamp PerformanceMainThread::CreationTime() const { void PerformanceMainThread::CreateNavigationTimingEntry() { MOZ_ASSERT(!mDocEntry, "mDocEntry should be null."); - if (!StaticPrefs::dom_enable_performance_navigation_timing()) { + if (!StaticPrefs::dom_enable_performance_navigation_timing() || + StaticPrefs::privacy_resistFingerprinting()) { return; } diff --git a/dom/performance/PerformanceNavigationTiming.cpp b/dom/performance/PerformanceNavigationTiming.cpp index dbc6aa78c4d5..fb18b91aabe6 100644 --- a/dom/performance/PerformanceNavigationTiming.cpp +++ b/dom/performance/PerformanceNavigationTiming.cpp @@ -6,6 +6,7 @@ #include "mozilla/dom/PerformanceNavigationTiming.h" #include "mozilla/dom/PerformanceNavigationTimingBinding.h" +#include "mozilla/StaticPrefs.h" using namespace mozilla::dom; @@ -138,3 +139,8 @@ void PerformanceNavigationTiming::UpdatePropertiesFromHttpChannel( nsIHttpChannel* aHttpChannel, nsITimedChannel* aChannel) { mTimingData->SetPropertiesFromHttpChannel(aHttpChannel, aChannel); } + +bool PerformanceNavigationTiming::Enabled(JSContext* aCx, JSObject* aGlobal) { + return (StaticPrefs::dom_enable_performance_navigation_timing() && + !StaticPrefs::privacy_resistFingerprinting()); +} diff --git a/dom/performance/PerformanceNavigationTiming.h b/dom/performance/PerformanceNavigationTiming.h index 8ef79999a1bc..7bf76ee3d670 100644 --- a/dom/performance/PerformanceNavigationTiming.h +++ b/dom/performance/PerformanceNavigationTiming.h @@ -65,6 +65,12 @@ class PerformanceNavigationTiming final : public PerformanceResourceTiming { void UpdatePropertiesFromHttpChannel(nsIHttpChannel* aHttpChannel, nsITimedChannel* aChannel); + /* + * For use with the WebIDL Func attribute to determine whether + * window.PerformanceNavigationTiming is exposed. + */ + static bool Enabled(JSContext* aCx, JSObject* aGlobal); + private: ~PerformanceNavigationTiming() {} }; diff --git a/dom/tests/mochitest/general/mochitest.ini b/dom/tests/mochitest/general/mochitest.ini index cb233881397d..36f955500c09 100644 --- a/dom/tests/mochitest/general/mochitest.ini +++ b/dom/tests/mochitest/general/mochitest.ini @@ -141,6 +141,7 @@ skip-if = toolkit == 'android' # bug 1230232 - Mouse doesn't select in the same [test_storagePermissionsReject.html] [test_storagePermissionsRejectForeign.html] [test_stylesheetPI.html] +[test_toggling_performance_navigation_timing.html] [test_vibrator.html] [test_WebKitCSSMatrix.html] [test_windowedhistoryframes.html] diff --git a/dom/tests/mochitest/general/test_toggling_performance_navigation_timing.html b/dom/tests/mochitest/general/test_toggling_performance_navigation_timing.html new file mode 100644 index 000000000000..88f7154286cd --- /dev/null +++ b/dom/tests/mochitest/general/test_toggling_performance_navigation_timing.html @@ -0,0 +1,47 @@ +<!DOCTYPE HTML> +<html> +<head> + <meta charset="utf-8"> + <title>Test for Bug 1511941 - Don't expose PerformanceNavigationTiming when it is disabled</title> + <script src="/tests/SimpleTest/SimpleTest.js"></script> + <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> +</head> +<body> + <div id="content"> </div> + <script type="application/javascript"> + async function testWhetherExposed(resistFingerprinting, enable_performance_navigation_timing) { + await SpecialPowers.pushPrefEnv({ + "set": [["privacy.resistFingerprinting", resistFingerprinting], + ["dom.enable_performance_navigation_timing", enable_performance_navigation_timing]], + }); + var iframe = document.createElement("iframe"); + document.body.append(iframe); + var p = iframe.contentWindow.PerformanceNavigationTiming; + if (resistFingerprinting) + is(p, undefined, "window.PerformanceNavigationTiming should not be exposed when" + + " dom.enable_performance_navigation_timing=" + enable_performance_navigation_timing + + " and privacy.resistFingerprinting="+ resistFingerprinting +"."); + if (!enable_performance_navigation_timing) + is(p, undefined, "window.PerformanceNavigationTiming should not be exposed when" + + " dom.enable_performance_navigation_timing=" + enable_performance_navigation_timing + + " and privacy.resistFingerprinting="+ resistFingerprinting +"."); + if (enable_performance_navigation_timing && !resistFingerprinting) { + isnot(p, undefined, "window.PerformanceNavigationTiming should be exposed when" + + " dom.enable_performance_navigation_timing=" + enable_performance_navigation_timing + + " and privacy.resistFingerprinting="+ resistFingerprinting +"."); + } + } + + async function start() { + await testWhetherExposed(true,true); + await testWhetherExposed(true,false); + await testWhetherExposed(false,true); + await testWhetherExposed(false,false); + SimpleTest.finish(); + } + + SimpleTest.waitForExplicitFinish(); + start(); + </script> +</body> +</html> diff --git a/dom/webidl/PerformanceNavigationTiming.webidl b/dom/webidl/PerformanceNavigationTiming.webidl index b26e1c18f688..cf029972304f 100644 --- a/dom/webidl/PerformanceNavigationTiming.webidl +++ b/dom/webidl/PerformanceNavigationTiming.webidl @@ -17,6 +17,8 @@ enum NavigationType { "prerender" }; +[Exposed=Window, + Func="mozilla::dom::PerformanceNavigationTiming::Enabled"] interface PerformanceNavigationTiming : PerformanceResourceTiming { readonly attribute DOMHighResTimeStamp unloadEventStart; readonly attribute DOMHighResTimeStamp unloadEventEnd;

1 0

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 15 May '20

15 May '20

commit 4ef7b854bb94a80c2ece6e3a1e823cde13c0f449 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 15 19:45:17 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- he/LC_MESSAGES/bridgedb.po | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/he/LC_MESSAGES/bridgedb.po b/he/LC_MESSAGES/bridgedb.po index 5593679564..ab331b2b97 100644 --- a/he/LC_MESSAGES/bridgedb.po +++ b/he/LC_MESSAGES/bridgedb.po @@ -18,14 +18,14 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2020-04-09 14:45-0700\n" -"PO-Revision-Date: 2020-04-15 19:46+0000\n" -"Last-Translator: Transifex Bot <>\n" +"POT-Creation-Date: 2020-05-14 14:21-0700\n" +"PO-Revision-Date: 2020-05-15 19:44+0000\n" +"Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.7.0\n" +"Generated-By: Babel 2.8.0\n" "Language: he\n" "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n" @@ -89,31 +89,26 @@ msgstr "הצג קוד QR" msgid "QRCode for your bridge lines" msgstr "קוד QR לרשימת הגשרים שלך" -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: bridgedb/distributors/https/templates/bridges.html:67 -#: bridgedb/distributors/https/templates/bridges.html:119 -msgid "Uh oh, spaghettios!" -msgstr "אוי ואבוי!" - -#: bridgedb/distributors/https/templates/bridges.html:68 +#: bridgedb/distributors/https/templates/bridges.html:63 msgid "It seems there was an error getting your QRCode." msgstr "נראה שנפלה טעות בקבלת קוד ה-QR שלך." -#: bridgedb/distributors/https/templates/bridges.html:73 +#: bridgedb/distributors/https/templates/bridges.html:68 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." msgstr "קוד QR זה מכיל את רשימת הגשרים שלך. סרוק אותו באמצעות קורא קוד QR על מנת להעתיק את רשימת הגשרים שלך לטלפון נייד ומכשירים אחרים." -#: bridgedb/distributors/https/templates/bridges.html:125 +#: bridgedb/distributors/https/templates/bridges.html:110 +msgid "BridgeDB encountered an error." +msgstr "" + +#: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..." msgstr "אין כרגע גשרים זמינים כלשהם…" -#: bridgedb/distributors/https/templates/bridges.html:127 -#: bridgedb/distributors/https/templates/bridges.html:131 +#: bridgedb/distributors/https/templates/bridges.html:118 +#: bridgedb/distributors/https/templates/bridges.html:122 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge "

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 15 May '20

15 May '20

commit 45bab79cf2124e8893abeb813f260215cb665b24 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 15 19:45:11 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- he/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/he/LC_MESSAGES/bridgedb.po b/he/LC_MESSAGES/bridgedb.po index 05262a8982..d3bb8e26af 100644 --- a/he/LC_MESSAGES/bridgedb.po +++ b/he/LC_MESSAGES/bridgedb.po @@ -19,8 +19,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-05-15 08:24+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-05-15 19:44+0000\n" +"Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -101,7 +101,7 @@ msgstr "קוד QR זה מכיל את רשימת הגשרים שלך. סרוק א #: bridgedb/distributors/https/templates/bridges.html:110 msgid "BridgeDB encountered an error." -msgstr "" +msgstr "BridgeDB נתקל בשגיאה." #: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..."

1 0

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 15 May '20

15 May '20

commit 8ffec7bc39c9f69d0b05eaab983a4fd56a5762d1 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 15 17:15:20 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- es/LC_MESSAGES/bridgedb.po | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po index 36d16a673e..04f059a186 100644 --- a/es/LC_MESSAGES/bridgedb.po +++ b/es/LC_MESSAGES/bridgedb.po @@ -24,14 +24,14 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2020-04-09 14:45-0700\n" -"PO-Revision-Date: 2020-04-15 19:46+0000\n" -"Last-Translator: Transifex Bot <>\n" +"POT-Creation-Date: 2020-05-14 14:21-0700\n" +"PO-Revision-Date: 2020-05-15 17:09+0000\n" +"Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.7.0\n" +"Generated-By: Babel 2.8.0\n" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -95,31 +95,26 @@ msgstr "Mostrar código QR" msgid "QRCode for your bridge lines" msgstr "Código QR para tus líneas de puentes" -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: bridgedb/distributors/https/templates/bridges.html:67 -#: bridgedb/distributors/https/templates/bridges.html:119 -msgid "Uh oh, spaghettios!" -msgstr "Oh oh, ¡la liamos! " - -#: bridgedb/distributors/https/templates/bridges.html:68 +#: bridgedb/distributors/https/templates/bridges.html:63 msgid "It seems there was an error getting your QRCode." msgstr "Parece que hubo un error al obtener tu código QR. " -#: bridgedb/distributors/https/templates/bridges.html:73 +#: bridgedb/distributors/https/templates/bridges.html:68 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." msgstr "Este código QR contiene sus líneas de puente. Escanéalo con un lector de códigos QR para copiar tus líneas de puente a dispositivos móviles y otros dispositivos." -#: bridgedb/distributors/https/templates/bridges.html:125 +#: bridgedb/distributors/https/templates/bridges.html:110 +msgid "BridgeDB encountered an error." +msgstr "" + +#: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..." msgstr "Ahora mismo no hay ningún puente disponible..." -#: bridgedb/distributors/https/templates/bridges.html:127 -#: bridgedb/distributors/https/templates/bridges.html:131 +#: bridgedb/distributors/https/templates/bridges.html:118 +#: bridgedb/distributors/https/templates/bridges.html:122 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge "

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 15 May '20

15 May '20

commit 2122c218806f003a2360ac486657dd3c4526f52d Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 15 17:15:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- es/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po index 6050486f20..4941e14d79 100644 --- a/es/LC_MESSAGES/bridgedb.po +++ b/es/LC_MESSAGES/bridgedb.po @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-05-15 08:24+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-05-15 17:09+0000\n" +"Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -107,7 +107,7 @@ msgstr "Este código QR contiene sus líneas de puente. Escanéalo con un lector #: bridgedb/distributors/https/templates/bridges.html:110 msgid "BridgeDB encountered an error." -msgstr "" +msgstr "BridgeDB ha encontrado un error" #: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..."

1 0

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 15 May '20

15 May '20

commit c02d14bfac1870b87af63a2928ed63893a77119b Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 15 15:15:24 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- fr/LC_MESSAGES/bridgedb.po | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po index bf99d4c1f0..57616ff062 100644 --- a/fr/LC_MESSAGES/bridgedb.po +++ b/fr/LC_MESSAGES/bridgedb.po @@ -29,14 +29,14 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2020-04-09 14:45-0700\n" -"PO-Revision-Date: 2020-04-15 19:46+0000\n" -"Last-Translator: Transifex Bot <>\n" +"POT-Creation-Date: 2020-05-14 14:21-0700\n" +"PO-Revision-Date: 2020-05-15 14:55+0000\n" +"Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.7.0\n" +"Generated-By: Babel 2.8.0\n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" @@ -100,31 +100,26 @@ msgstr "Afficher le code QR" msgid "QRCode for your bridge lines" msgstr "Code QR pour vos lignes de ponts" -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: bridgedb/distributors/https/templates/bridges.html:67 -#: bridgedb/distributors/https/templates/bridges.html:119 -msgid "Uh oh, spaghettios!" -msgstr "Un problème est survenu !" - -#: bridgedb/distributors/https/templates/bridges.html:68 +#: bridgedb/distributors/https/templates/bridges.html:63 msgid "It seems there was an error getting your QRCode." msgstr "Il semble qu’il y ait eu une erreur de récupération de votre code QR." -#: bridgedb/distributors/https/templates/bridges.html:73 +#: bridgedb/distributors/https/templates/bridges.html:68 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." msgstr "Ce code QR comprend vos lignes de ponts. Lisez-le avec un lecteur de codes QR pour copier vos lignes de pont sur vos appareils, mobiles ou autres." -#: bridgedb/distributors/https/templates/bridges.html:125 +#: bridgedb/distributors/https/templates/bridges.html:110 +msgid "BridgeDB encountered an error." +msgstr "Une erreur de BridgeDB est survenue." + +#: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..." msgstr "Aucun pont n’est disponible actuellement…" -#: bridgedb/distributors/https/templates/bridges.html:127 -#: bridgedb/distributors/https/templates/bridges.html:131 +#: bridgedb/distributors/https/templates/bridges.html:118 +#: bridgedb/distributors/https/templates/bridges.html:122 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge "

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 15 May '20

15 May '20

commit 26926ce036ce8e97807cb3f0438606ba607df554 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 15 15:15:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- fa/LC_MESSAGES/bridgedb.po | 6 +++--- fr/LC_MESSAGES/bridgedb.po | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fa/LC_MESSAGES/bridgedb.po b/fa/LC_MESSAGES/bridgedb.po index 724cd89d3b..30376d4ab7 100644 --- a/fa/LC_MESSAGES/bridgedb.po +++ b/fa/LC_MESSAGES/bridgedb.po @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-05-15 08:24+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-05-15 15:15+0000\n" +"Last-Translator: Seyyed Hossein Darvari <xhdix(a)yahoo.com>\n" "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -107,7 +107,7 @@ msgstr "این QRCode شامل مسیرهای پل شما می باشد. آن ر #: bridgedb/distributors/https/templates/bridges.html:110 msgid "BridgeDB encountered an error." -msgstr "" +msgstr "BridgeDB با خطایی روبرو شد." #: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..." diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po index f7c279c81e..57616ff062 100644 --- a/fr/LC_MESSAGES/bridgedb.po +++ b/fr/LC_MESSAGES/bridgedb.po @@ -30,8 +30,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-05-15 08:24+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-05-15 14:55+0000\n" +"Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -112,7 +112,7 @@ msgstr "Ce code QR comprend vos lignes de ponts. Lisez-le avec un lecteur de cod #: bridgedb/distributors/https/templates/bridges.html:110 msgid "BridgeDB encountered an error." -msgstr "" +msgstr "Une erreur de BridgeDB est survenue." #: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..."

1 0

[tor/release-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.1
by nickm＠torproject.org 15 May '20

15 May '20

commit 768ffb8f43575baac0970659b01e0a484d6bd6de Merge: 72312cdbb a59d54756 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 15 10:25:27 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.4.3] bump to 0.4.3.5-dev
by nickm＠torproject.org 15 May '20

15 May '20

commit c0dd2a6e398c647ed7e219a9577a9864f48aba1a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 15 09:02:12 2020 -0400 bump to 0.4.3.5-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 1ac4db84d..cb552ea94 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.3.5]) +AC_INIT([tor],[0.4.3.5-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -16,7 +16,7 @@ configure_flags="$*" # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2020-05-14"], # for 0.4.3.5 +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-05-15"], # for 0.4.3.5-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 53dbbe90f..efb64327f 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.3.5" +!define VERSION "0.4.3.5-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index ee5c48b44..9e18ee9fa 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.3.5" +#define VERSION "0.4.3.5-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0