- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-68.5.0esr-9.5-1] fixup! Pick up latest Torbutton code
by sysrqb＠torproject.org 03 Mar '20

03 Mar '20

commit 8845388ceda26c7f1b3b262cbb5e9dbc07116bb9 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Mar 3 20:26:39 2020 +0000 fixup! Pick up latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 078ae18e5f1c..a3cd239df2c2 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 078ae18e5f1cbf888e7c86c8aecaa383a727bf0d +Subproject commit a3cd239df2c2817b6bd58a58514e8e0d1795b4bf

1 0

[tor-launcher/master] Release preparations for 0.2.21.3
by sysrqb＠torproject.org 03 Mar '20

03 Mar '20

commit 2b1424d1a4439e74366f21c0f23d71c36380cf95 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Mar 3 20:22:32 2020 +0000 Release preparations for 0.2.21.3 --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index ac54464..919d5e8 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.21.2</em:version> + <em:version>0.2.21.3</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-launcher/master] Translations update
by sysrqb＠torproject.org 03 Mar '20

03 Mar '20

commit 64dd7ea86c1ecaa54fbcd40019af6b157201f61a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Mar 3 20:21:59 2020 +0000 Translations update --- src/chrome/locale/af/torlauncher.properties | 3 ++- src/chrome/locale/ar/torlauncher.properties | 3 ++- src/chrome/locale/ast/torlauncher.properties | 3 ++- src/chrome/locale/az/torlauncher.properties | 3 ++- src/chrome/locale/be/torlauncher.properties | 3 ++- src/chrome/locale/bg/torlauncher.properties | 3 ++- src/chrome/locale/bn-BD/torlauncher.properties | 3 ++- src/chrome/locale/br/torlauncher.properties | 3 ++- src/chrome/locale/bs/torlauncher.properties | 3 ++- src/chrome/locale/ca/torlauncher.properties | 3 ++- src/chrome/locale/cs/torlauncher.properties | 3 ++- src/chrome/locale/cy/torlauncher.properties | 3 ++- src/chrome/locale/da/torlauncher.properties | 7 ++++--- src/chrome/locale/de/torlauncher.properties | 3 ++- src/chrome/locale/el/torlauncher.properties | 3 ++- src/chrome/locale/eo/torlauncher.properties | 3 ++- src/chrome/locale/es-AR/torlauncher.properties | 3 ++- src/chrome/locale/es-ES/torlauncher.properties | 3 ++- src/chrome/locale/es-MX/torlauncher.properties | 3 ++- src/chrome/locale/et/torlauncher.properties | 3 ++- src/chrome/locale/eu/torlauncher.properties | 3 ++- src/chrome/locale/fa/torlauncher.properties | 3 ++- src/chrome/locale/fi/torlauncher.properties | 3 ++- src/chrome/locale/fr/torlauncher.properties | 3 ++- src/chrome/locale/fy-NL/torlauncher.properties | 3 ++- src/chrome/locale/ga-IE/torlauncher.properties | 3 ++- src/chrome/locale/gl/torlauncher.properties | 3 ++- src/chrome/locale/gu-IN/torlauncher.properties | 3 ++- src/chrome/locale/he/torlauncher.properties | 3 ++- src/chrome/locale/hi-IN/torlauncher.properties | 3 ++- src/chrome/locale/hr/torlauncher.properties | 3 ++- src/chrome/locale/hu/torlauncher.properties | 3 ++- src/chrome/locale/hy-AM/torlauncher.properties | 3 ++- src/chrome/locale/id/torlauncher.properties | 3 ++- src/chrome/locale/is/torlauncher.properties | 3 ++- src/chrome/locale/it/torlauncher.properties | 3 ++- src/chrome/locale/ja/torlauncher.properties | 3 ++- src/chrome/locale/ka/torlauncher.properties | 3 ++- src/chrome/locale/kk/torlauncher.properties | 3 ++- src/chrome/locale/km/torlauncher.properties | 3 ++- src/chrome/locale/ko/torlauncher.properties | 3 ++- src/chrome/locale/lt/torlauncher.properties | 3 ++- src/chrome/locale/lv/torlauncher.properties | 3 ++- src/chrome/locale/mk/torlauncher.properties | 3 ++- src/chrome/locale/ml/torlauncher.properties | 3 ++- src/chrome/locale/mr/torlauncher.properties | 3 ++- src/chrome/locale/ms/torlauncher.properties | 3 ++- src/chrome/locale/my/torlauncher.properties | 3 ++- src/chrome/locale/nb-NO/network-settings.dtd | 4 ++-- src/chrome/locale/nb-NO/torlauncher.properties | 3 ++- src/chrome/locale/ne/torlauncher.properties | 3 ++- src/chrome/locale/nl-BE/torlauncher.properties | 3 ++- src/chrome/locale/nl/torlauncher.properties | 3 ++- src/chrome/locale/nn-NO/torlauncher.properties | 3 ++- src/chrome/locale/oc/torlauncher.properties | 3 ++- src/chrome/locale/pa-IN/torlauncher.properties | 3 ++- src/chrome/locale/pl/torlauncher.properties | 3 ++- src/chrome/locale/pt-BR/torlauncher.properties | 3 ++- src/chrome/locale/pt-PT/torlauncher.properties | 3 ++- src/chrome/locale/ro/torlauncher.properties | 3 ++- src/chrome/locale/ru/torlauncher.properties | 3 ++- src/chrome/locale/si/torlauncher.properties | 3 ++- src/chrome/locale/sk/torlauncher.properties | 3 ++- src/chrome/locale/sl/torlauncher.properties | 3 ++- src/chrome/locale/sq/torlauncher.properties | 3 ++- src/chrome/locale/sr/torlauncher.properties | 3 ++- src/chrome/locale/sv-SE/torlauncher.properties | 3 ++- src/chrome/locale/sw/torlauncher.properties | 3 ++- src/chrome/locale/ta/torlauncher.properties | 3 ++- src/chrome/locale/te/torlauncher.properties | 3 ++- src/chrome/locale/th/torlauncher.properties | 3 ++- src/chrome/locale/tr/torlauncher.properties | 3 ++- src/chrome/locale/uk/torlauncher.properties | 3 ++- src/chrome/locale/ur/torlauncher.properties | 3 ++- src/chrome/locale/uz/torlauncher.properties | 3 ++- src/chrome/locale/vi/torlauncher.properties | 3 ++- src/chrome/locale/zh-CN/torlauncher.properties | 3 ++- src/chrome/locale/zh-HK/torlauncher.properties | 3 ++- src/chrome/locale/zh-TW/torlauncher.properties | 3 ++- 79 files changed, 160 insertions(+), 82 deletions(-) diff --git a/src/chrome/locale/af/torlauncher.properties b/src/chrome/locale/af/torlauncher.properties index ca9774b..6ec8c40 100644 --- a/src/chrome/locale/af/torlauncher.properties +++ b/src/chrome/locale/af/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties index b1e5c60..4cf4e1f 100644 --- a/src/chrome/locale/ar/torlauncher.properties +++ b/src/chrome/locale/ar/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=مُشغل تور @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=غير قادر علي بدء تشغيل تور. torlauncher.tor_missing=الملف التنفيذي لتور مفقود. torlauncher.torrc_missing=ملف torrc غير موجود وتعذّر إنشاؤه. torlauncher.datadir_missing=دليل بيانات تور غير موجود وتعذّر إنشاؤه. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=فشل في الحصول على كلمة المرور المجزأة. torlauncher.failed_to_get_settings=غير قادر علي جلب إعدادات تور.\n\n%S diff --git a/src/chrome/locale/ast/torlauncher.properties b/src/chrome/locale/ast/torlauncher.properties index ca9774b..6ec8c40 100644 --- a/src/chrome/locale/ast/torlauncher.properties +++ b/src/chrome/locale/ast/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/az/torlauncher.properties b/src/chrome/locale/az/torlauncher.properties index 5aae047..6d5f0c6 100644 --- a/src/chrome/locale/az/torlauncher.properties +++ b/src/chrome/locale/az/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor İşlədici @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Tor başlaya bilmir.\n\n%S torlauncher.tor_missing=İcra edilə bilən Tor çatışmır. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Qarışıd şifrə əldə edə bilmədi. torlauncher.failed_to_get_settings=Tor parametrlərinin bərpası mümkün olmadı.\n\n%S diff --git a/src/chrome/locale/be/torlauncher.properties b/src/chrome/locale/be/torlauncher.properties index da99d88..e16f923 100644 --- a/src/chrome/locale/be/torlauncher.properties +++ b/src/chrome/locale/be/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/bg/torlauncher.properties b/src/chrome/locale/bg/torlauncher.properties index a44d85e..8307aa0 100644 --- a/src/chrome/locale/bg/torlauncher.properties +++ b/src/chrome/locale/bg/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Тор лънчер @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Невъзможно е да се стартир torlauncher.tor_missing=Приложението "Tor" липсва. torlauncher.torrc_missing=torrc файлът липсва и не можа да бъде създаден. torlauncher.datadir_missing=Tor data директорията не съществува и не можа да бъде създадена +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Проблем с изтеглянето на хеширани пароли. torlauncher.failed_to_get_settings=Невъзможно е получаването на настройките на Tor.\n\n%S diff --git a/src/chrome/locale/bn-BD/torlauncher.properties b/src/chrome/locale/bn-BD/torlauncher.properties index 87cff7a..9b92f6d 100644 --- a/src/chrome/locale/bn-BD/torlauncher.properties +++ b/src/chrome/locale/bn-BD/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=টর লঞ্চার @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=টর শুরু করতে অক্ষম torlauncher.tor_missing=টর্ক এক্সিকিউটেবল মিস করা হয়। torlauncher.torrc_missing=Torrc ফাইলটি অনুপস্থিত এবং তৈরি করা যায়নি। torlauncher.datadir_missing=টর ডেটা ডিরেক্টরিটি বিদ্যমান নয় এবং তৈরি করা যাবে না। +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=হ্যাশড পাসওয়ার্ড পেতে ব্যর্থ। torlauncher.failed_to_get_settings=টর সেটিংস পুনরুদ্ধার করতে অক্ষম। %S diff --git a/src/chrome/locale/br/torlauncher.properties b/src/chrome/locale/br/torlauncher.properties index 2571fb6..3a58be4 100644 --- a/src/chrome/locale/br/torlauncher.properties +++ b/src/chrome/locale/br/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/bs/torlauncher.properties b/src/chrome/locale/bs/torlauncher.properties index ca9774b..6ec8c40 100644 --- a/src/chrome/locale/bs/torlauncher.properties +++ b/src/chrome/locale/bs/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/ca/torlauncher.properties b/src/chrome/locale/ca/torlauncher.properties index ea272d0..b0d10b2 100644 --- a/src/chrome/locale/ca/torlauncher.properties +++ b/src/chrome/locale/ca/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Inicialitzador Tor @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=No s'ha pogut iniciar Tor.\n%S torlauncher.tor_missing=Falta l'executable de Tor. torlauncher.torrc_missing=El fitxer torrc no hi és i no s'ha pogut crear. torlauncher.datadir_missing=La carpeta de dades de Tor no existeix i no s'ha pogut crear. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Ha fallat l'obtenció de la contrasenya hash. torlauncher.failed_to_get_settings=No s'ha pogut obtenir la configuració de Tor\n%S diff --git a/src/chrome/locale/cs/torlauncher.properties b/src/chrome/locale/cs/torlauncher.properties index 3595bda..0fb961d 100644 --- a/src/chrome/locale/cs/torlauncher.properties +++ b/src/chrome/locale/cs/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Spouštěč Toru @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Tor není možné zapnout\n\n%S torlauncher.tor_missing=Spustitelný soubor Toru chybí. torlauncher.torrc_missing=Chybí soubor torrc a nemohl být vytvořen. torlauncher.datadir_missing=Složka s daty Toru neexistuje a nemohla být vytvořena. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Nepovedlo se získat hashované heslo. torlauncher.failed_to_get_settings=Nelze načíst nastavení Toru.\n\n%S diff --git a/src/chrome/locale/cy/torlauncher.properties b/src/chrome/locale/cy/torlauncher.properties index 1c25f37..e1b5914 100644 --- a/src/chrome/locale/cy/torlauncher.properties +++ b/src/chrome/locale/cy/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lansiwr Tor @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Methu cychwyn Tor.\n\n%S torlauncher.tor_missing=Mae'r gweithredadwyn Tor ar goll. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Methwyd gael cyfrinair stwnshlyd. torlauncher.failed_to_get_settings=Methwyd nôl gosodiadau Tor.\n\n%S diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties index 8431069..3338624 100644 --- a/src/chrome/locale/da/torlauncher.properties +++ b/src/chrome/locale/da/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor starter @@ -14,8 +14,9 @@ torlauncher.tor_bootstrap_failed_details=%1$S fejlede (%2$S). torlauncher.unable_to_start_tor=Kan ikke starte Tor.\n\n%S torlauncher.tor_missing=Kunne ikke finde Tor-programmet. -torlauncher.torrc_missing=torrc-filen mangler og kunne ikke dannes. -torlauncher.datadir_missing=Tor-datamappen findes ikke og kunne ikke dannes. +torlauncher.torrc_missing=torrc-filen mangler og kunne ikke oprettes. +torlauncher.datadir_missing=Tor-datamappen findes ikke og kunne ikke oprettes. +torlauncher.onionauthdir_missing=Tor-onionautentifikationsmappen findes ikke og kunne ikke oprettes. torlauncher.password_hash_missing=Kunne ikke finde hash-værdi af adgangskode. torlauncher.failed_to_get_settings=Kan ikke hente Tor-indstillingerne..\n\n%S diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties index 026d24e..15b994a 100644 --- a/src/chrome/locale/de/torlauncher.properties +++ b/src/chrome/locale/de/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor-Starter @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Tor kann nicht gestartet werden.\n\n%S torlauncher.tor_missing=Die Tor-Programmdatei ist nicht vorhanden. torlauncher.torrc_missing=Die torrc Datei fehlt und konnte nicht erstellt werden. torlauncher.datadir_missing=Das Tor Dateiverzeichnis existiert nicht und konnte nicht erstellt werden. +torlauncher.onionauthdir_missing=Das Tor-Onion-Bestätigungsverzeichnis existiert nicht und konnte nicht erstellt werden. torlauncher.password_hash_missing=Erhalt des Hash-Passwortes ist fehlgeschlagen. torlauncher.failed_to_get_settings=Die Tor-Einstellungen können nicht abgefragt werden.\n\n%S diff --git a/src/chrome/locale/el/torlauncher.properties b/src/chrome/locale/el/torlauncher.properties index f3f7096..980ac56 100644 --- a/src/chrome/locale/el/torlauncher.properties +++ b/src/chrome/locale/el/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Αδυναμία εκκίνησης του Tor. torlauncher.tor_missing=Το Tor εκτελέσιμο λείπει. torlauncher.torrc_missing=Το αρχείο torrc λείπει και δεν μπορεί να δημιουργηθεί. torlauncher.datadir_missing=Ο κατάλογος δεδομένων Tor δεν υπάρχει και δεν μπορεί να δημιουργηθεί. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Απέτυχε να πάρει διαγραμμισμένο κωδικό πρόσβασης. torlauncher.failed_to_get_settings=Αποτυχία διαγραφής των Tor ρυθμισεων.⏎\n⏎\n%S diff --git a/src/chrome/locale/eo/torlauncher.properties b/src/chrome/locale/eo/torlauncher.properties index 12823b8..6e500f2 100644 --- a/src/chrome/locale/eo/torlauncher.properties +++ b/src/chrome/locale/eo/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor-startigilo @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Ne eblas starti Tor.\n\n%S torlauncher.tor_missing=Tor-komandodosiero mankas. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Malsukcesis ricevado de haketigita pasvorto. torlauncher.failed_to_get_settings=Ne eblas ricevi agordojn de Tor.\n\n%S diff --git a/src/chrome/locale/es-AR/torlauncher.properties b/src/chrome/locale/es-AR/torlauncher.properties index 1629d99..4669458 100644 --- a/src/chrome/locale/es-AR/torlauncher.properties +++ b/src/chrome/locale/es-AR/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lanzador de Tor @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=No se puede iniciar Tor.\n\n%S torlauncher.tor_missing=No se encuentra el archivo ejecutable de Tor. torlauncher.torrc_missing=No se encuentra el archivo torrc y no pudo ser creado. torlauncher.datadir_missing=El directorio de datos de Tor no existe y no pudo ser creado. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Falló al conseguir contraseñas encriptadas. torlauncher.failed_to_get_settings=No se pudo acceder a las configuraciones de Tor.\n\n%S diff --git a/src/chrome/locale/es-ES/torlauncher.properties b/src/chrome/locale/es-ES/torlauncher.properties index 532e5b5..8ff77a1 100644 --- a/src/chrome/locale/es-ES/torlauncher.properties +++ b/src/chrome/locale/es-ES/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Arranque de Tor @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Imposible iniciar Tor.\n\n%S torlauncher.tor_missing=No se encuentra el archivo ejecutable de Tor. torlauncher.torrc_missing=No existe el fichero torcc y no puede ser creado. torlauncher.datadir_missing=El directorio de datos de Tor no existe y no puede ser creado +torlauncher.onionauthdir_missing=El directorio de autenticación de la cebolla de Tor no existe y no se podría crear. torlauncher.password_hash_missing=Fallo al obtener la contraseña cifrada. torlauncher.failed_to_get_settings=No se pudo recuperar las preferencias de Tor.\n\n%S diff --git a/src/chrome/locale/es-MX/torlauncher.properties b/src/chrome/locale/es-MX/torlauncher.properties index f6296c9..b596a6e 100644 --- a/src/chrome/locale/es-MX/torlauncher.properties +++ b/src/chrome/locale/es-MX/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lanzador Tor @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=No se ha podido iniciar Tor.\n\n%S torlauncher.tor_missing=Falta el ejecutable de Tor. torlauncher.torrc_missing=El archivo "torrc" no se encontró y no pudo ser creado. torlauncher.datadir_missing=El directorio de datos de Tor no existe y no se pudo ser creado. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=No se pudo obtener la contraseña cifrada. torlauncher.failed_to_get_settings=No se puede recuperar la configuración de Tor. \n\n% S diff --git a/src/chrome/locale/et/torlauncher.properties b/src/chrome/locale/et/torlauncher.properties index 1581934..868e761 100644 --- a/src/chrome/locale/et/torlauncher.properties +++ b/src/chrome/locale/et/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor\\'i käivitaja @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Ei suuda käivitada Tor-i.\n\n\n%S torlauncher.tor_missing=The Tor executable is missing. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/eu/torlauncher.properties b/src/chrome/locale/eu/torlauncher.properties index 4d6d383..bd29af4 100644 --- a/src/chrome/locale/eu/torlauncher.properties +++ b/src/chrome/locale/eu/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor abiarazlea @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Ezin izan da Tor hasi.\n\n%S torlauncher.tor_missing=Tor exekutagarria falta da. torlauncher.torrc_missing=torrc fitxategia falta da eta ezin izan da sortu. torlauncher.datadir_missing=Tor datu direktorioa ez da existitzen eta ezin izan da sortu. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Huts egin du hash-eatutako pasahitza eskuratzen. torlauncher.failed_to_get_settings=Ezin izan dira Tor ezarpenak berreskuratu.\n\n%S diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties index df7893a..c5674ab 100644 --- a/src/chrome/locale/fa/torlauncher.properties +++ b/src/chrome/locale/fa/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=اجراکننده Tor @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Tor قادر به اجرا شدن نیست\n\n%S torlauncher.tor_missing=فایل اجرایی Tor یافت نشد. torlauncher.torrc_missing=فایل torrc پیدا نشد و ساخت فایل جدید ناموفق بود. torlauncher.datadir_missing=دایرکتوری اطلاعات تٌر وجود ندارد و ساخت آن نیز ناموفق بود. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=کلمهٔ عبور رمزشده دریافت نشد. torlauncher.failed_to_get_settings=ناموفق در بازگردانی تنظیمات Tor.\n\n%S diff --git a/src/chrome/locale/fi/torlauncher.properties b/src/chrome/locale/fi/torlauncher.properties index f683527..151554a 100644 --- a/src/chrome/locale/fi/torlauncher.properties +++ b/src/chrome/locale/fi/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor-käynnistin @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Tor-sovelluksen käynnistys epäonnistui.\n\n%S torlauncher.tor_missing=Suoritettava Tor-tiedosto puuttuu. torlauncher.torrc_missing=Torrc tiedostoa ei löydetty ja sitä ei voitu luoda uudelleen. torlauncher.datadir_missing=Tor tietohakemistoa ei ole olemassa, ja sitä ei voida luoda uudellen. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Tiivistettyä salasanaa ei löytynyt. torlauncher.failed_to_get_settings=Tor-asetusten noutaminen epäonnistui.\n\n%S diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index 4c4284f..10ab674 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lanceur Tor @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Impossible de démarrer Tor.\n\n%S torlauncher.tor_missing=Il manque l’exécutable Tor. torlauncher.torrc_missing=Le fichier torrc manque et n’a pas pu être créé. torlauncher.datadir_missing=Le répertoire de données de Tor n’existe pas et n’a pas pu être créé. +torlauncher.onionauthdir_missing=Le répertoire d’authentification onion de Tor n’existe pas et n’a pas pu être créé. torlauncher.password_hash_missing=Impossible d’obtenir le mot de passe haché. torlauncher.failed_to_get_settings=Impossible de récupérer les paramètres de Tor.\n\n%S diff --git a/src/chrome/locale/fy-NL/torlauncher.properties b/src/chrome/locale/fy-NL/torlauncher.properties index c4eccc9..693896b 100644 --- a/src/chrome/locale/fy-NL/torlauncher.properties +++ b/src/chrome/locale/fy-NL/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/ga-IE/torlauncher.properties b/src/chrome/locale/ga-IE/torlauncher.properties index ccf3908..8b11073 100644 --- a/src/chrome/locale/ga-IE/torlauncher.properties +++ b/src/chrome/locale/ga-IE/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tosaitheoir Tor @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Níorbh fhéidir Tor a thosú.\n\n%S torlauncher.tor_missing=Tá an clár inrite Tor ar iarraidh. torlauncher.torrc_missing=Tá an comhad torrc ar iarraidh agus níorbh fhéidir é a chruthú. torlauncher.datadir_missing=Níl comhadlann sonraí Tor ann agus níorbh fhéidir é a chruthú. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Níl aon fháil ar an bhfocal faire haiseáilte. torlauncher.failed_to_get_settings=Ní féidir socruithe Tor a fháil.\n\n%S diff --git a/src/chrome/locale/gl/torlauncher.properties b/src/chrome/locale/gl/torlauncher.properties index c15b89f..2328035 100644 --- a/src/chrome/locale/gl/torlauncher.properties +++ b/src/chrome/locale/gl/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lanzador do Tor @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Non se puido iniciar o Tor.⏎\n⏎\n%S torlauncher.tor_missing=Falta o executábel do Tor. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Non se puido obter o contrasinal cifrado. torlauncher.failed_to_get_settings=Non se pode recuperar a configuración do Tor.⏎\n⏎\n%S diff --git a/src/chrome/locale/gu-IN/torlauncher.properties b/src/chrome/locale/gu-IN/torlauncher.properties index b040847..cf08643 100644 --- a/src/chrome/locale/gu-IN/torlauncher.properties +++ b/src/chrome/locale/gu-IN/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/he/torlauncher.properties b/src/chrome/locale/he/torlauncher.properties index 0a0768f..fd464c5 100644 --- a/src/chrome/locale/he/torlauncher.properties +++ b/src/chrome/locale/he/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=משגר Tor @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=לא היה ניתן להתחיל את Tor.\n\n% torlauncher.tor_missing=קובץ ההפעלה של Tor חסר. torlauncher.torrc_missing=קובץ ה-torrc חסר ולא היה יכול להיווצר. torlauncher.datadir_missing=תיקיית הנתונים של Tor אינה קיימת ולא יכלה להיווצר. +torlauncher.onionauthdir_missing=סיפריית אימות הבצל של Tor אינה קיימת ולא יכלה להיווצר. torlauncher.password_hash_missing=נכשל בהשגת סיסמה מעורבלת. torlauncher.failed_to_get_settings=לא היה ניתן לאחזר הגדרות Tor.\n\n%S diff --git a/src/chrome/locale/hi-IN/torlauncher.properties b/src/chrome/locale/hi-IN/torlauncher.properties index 143c277..60dedca 100644 --- a/src/chrome/locale/hi-IN/torlauncher.properties +++ b/src/chrome/locale/hi-IN/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=टोर लॉन्चर @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=टोर शुरू करने में torlauncher.tor_missing=Tor exe फ़ाइल गुम है। torlauncher.torrc_missing=Torrc फ़ाइल गुम है और बनाया नहीं जा सका। torlauncher.datadir_missing=टोर डेटा निर्देशिका मौजूद नहीं है और बनाया नहीं जा सका। +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=हैश पासवर्ड प्राप्त करने में विफल। torlauncher.failed_to_get_settings=टोर सेटिंग्स को पुनः प्राप्त करने में असमर्थ।\n\n%S diff --git a/src/chrome/locale/hr/torlauncher.properties b/src/chrome/locale/hr/torlauncher.properties index 1748e08..4e0906b 100644 --- a/src/chrome/locale/hr/torlauncher.properties +++ b/src/chrome/locale/hr/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Nije moguće pokrenuti Tor.\n\n%S torlauncher.tor_missing=Nije moguće pronaći izvršni program za Tor. torlauncher.torrc_missing=Torrc datoteka nedostaje i nije mogla biti stvorena. torlauncher.datadir_missing=Direktorij s Tor podacima ne postoji i nije mogao biti stvoren. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Nije moguće dobiti hash lozinke. torlauncher.failed_to_get_settings=Nije moguće dobaviti Tor postavke.\n\n%S diff --git a/src/chrome/locale/hu/torlauncher.properties b/src/chrome/locale/hu/torlauncher.properties index f46680d..f21ba76 100644 --- a/src/chrome/locale/hu/torlauncher.properties +++ b/src/chrome/locale/hu/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Indító @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Nem sikerült a Tor-t elindítani.\n\n%S torlauncher.tor_missing=A Tor futtatható állomány hiányzik. torlauncher.torrc_missing=A torrc fájl hiányzik és nem lehet létrehozni. torlauncher.datadir_missing=A Tor data könyvtár nem létezik és nem lehet létrehozni. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Nem sikerült megszerezni a hash-elt jelszót. torlauncher.failed_to_get_settings=Sikertelen a Tor beállítások lekérése.\n\n%S diff --git a/src/chrome/locale/hy-AM/torlauncher.properties b/src/chrome/locale/hy-AM/torlauncher.properties index a945dde..d990486 100644 --- a/src/chrome/locale/hy-AM/torlauncher.properties +++ b/src/chrome/locale/hy-AM/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/id/torlauncher.properties b/src/chrome/locale/id/torlauncher.properties index 6e4b484..87e6225 100644 --- a/src/chrome/locale/id/torlauncher.properties +++ b/src/chrome/locale/id/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Peluncur Tor @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Tidak dapat memulai Tor\n\n%S torlauncher.tor_missing=Tor executable hilang torlauncher.torrc_missing=Berkas torrc hilang dan tidak dapat dibuat. torlauncher.datadir_missing=Direktori data tor tidak ada dan tidak dapat dibuat. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Gagal mendapatkan kata sandi hashed. torlauncher.failed_to_get_settings=Gagal mendapatkan pengaturan Tor.\n\n%S diff --git a/src/chrome/locale/is/torlauncher.properties b/src/chrome/locale/is/torlauncher.properties index 5d87480..66a49e0 100644 --- a/src/chrome/locale/is/torlauncher.properties +++ b/src/chrome/locale/is/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor-ræsir @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Tókst ekki að ræsa Tor.\n\n%S torlauncher.tor_missing=Vantar Tor-keyrsluskrána. torlauncher.torrc_missing=Skrána torrc vantar og var ekki hægt að útbúa hana. torlauncher.datadir_missing=Tor-gagnamappan er ekki til og var ekki hægt að útbúa hana. +torlauncher.onionauthdir_missing=Tor-auðkenningarmappan er ekki til og var ekki hægt að útbúa hana. torlauncher.password_hash_missing=Mistókst að fá hakkað lykilorð. torlauncher.failed_to_get_settings=Tókst ekki að nálgast stillingar fyrir Tor.\n\n%S diff --git a/src/chrome/locale/it/torlauncher.properties b/src/chrome/locale/it/torlauncher.properties index f9fbf6a..9597d81 100644 --- a/src/chrome/locale/it/torlauncher.properties +++ b/src/chrome/locale/it/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Avviatore di Tor @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Impossibile avviare Tor.⏎\n⏎\n%S torlauncher.tor_missing=Il file eseguibile di Tor è mancante. torlauncher.torrc_missing=Il file torrc non è presente e non è stato possibile crearlo. torlauncher.datadir_missing=La cartella dei dati di Tor non esiste e non è stato possibile crearla. +torlauncher.onionauthdir_missing=La cartella di autenticazione onion di Tor non esiste e non è stato possibile crearla. torlauncher.password_hash_missing=Tentativo di ottenere la password fallito. torlauncher.failed_to_get_settings=Impossibile recuperare le impostazioni di Tor.⏎\n⏎\n%S diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties index 38ef19a..f233fc2 100644 --- a/src/chrome/locale/ja/torlauncher.properties +++ b/src/chrome/locale/ja/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Torを開始出来ません。\n\n%S torlauncher.tor_missing=Torの実行可能ファイルが見つかりません。 torlauncher.torrc_missing=torrcファイルが見つからず、作成もできませんでした。 torlauncher.datadir_missing=Torのデータディレクトリが存在せず、作成もできませんでした。 +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=ハッシュ化されたパスワードの入手に失敗しました torlauncher.failed_to_get_settings=Torの設定を回復出来ません。\n\n%S diff --git a/src/chrome/locale/ka/torlauncher.properties b/src/chrome/locale/ka/torlauncher.properties index c51cdfd..473ef6c 100644 --- a/src/chrome/locale/ka/torlauncher.properties +++ b/src/chrome/locale/ka/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor-ის გამშვები @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Tor-ის გაშვება ვერ ხ torlauncher.tor_missing=Tor-ის გამშვები ვერ მოიძებნა. torlauncher.torrc_missing=torrc-ფაილი ვერ მოინახა და ვერ შეიქმნება. torlauncher.datadir_missing=Tor-ის მონაცემთა საქაღალდე არ არსებობს და ვერ შეიქმნება. +torlauncher.onionauthdir_missing=Tor-onion-ის მონაცემთა დამოწმების საქაღალდე არ არსებობს და ვერ იქმნება. torlauncher.password_hash_missing=ჰეშირებული პაროლის მიღება ვერ მოხერხდა. torlauncher.failed_to_get_settings=Tor-ის პარამეტრების მიღება ვერ ხერხდება.\n\n%S diff --git a/src/chrome/locale/kk/torlauncher.properties b/src/chrome/locale/kk/torlauncher.properties index e9f1e5b..81382ed 100644 --- a/src/chrome/locale/kk/torlauncher.properties +++ b/src/chrome/locale/kk/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor іске қосу құрылғысы @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Tor іске қосылмады.\n\n%S torlauncher.tor_missing=Tor орындаушысы жоқ. torlauncher.torrc_missing=Torrc файлы жоқ және жасалмады. torlauncher.datadir_missing=Tor деректер каталогы жоқ және жасалмады. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Құпия сөзді алу сәтсіз аяқталды. torlauncher.failed_to_get_settings=Tor параметрлерін шығарып алу мүмкін емес.\n\n%S diff --git a/src/chrome/locale/km/torlauncher.properties b/src/chrome/locale/km/torlauncher.properties index 5774122..457fd70 100644 --- a/src/chrome/locale/km/torlauncher.properties +++ b/src/chrome/locale/km/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=កម្មវិធីចាប់ផ្ដើម Tor @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=មិនអាចចាប់ផ្ដើ torlauncher.tor_missing=បាត់ឯកសារអាចប្រតិបត្តិរបស់ Tor ។ torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=បានបរាជ័យក្នុងការទទួលពាក្យសម្ងាត់។ torlauncher.failed_to_get_settings=មិនអាចទៅយកការកំណត់ Tor ។\n\n%S diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties index 7b430b3..2930e1c 100644 --- a/src/chrome/locale/ko/torlauncher.properties +++ b/src/chrome/locale/ko/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor 런처 @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Tor를 시작할 수 없습니다.\n\n%S torlauncher.tor_missing=Tor 실행 파일이 없습니다. torlauncher.torrc_missing=torrc 파일이 사라졌으며 생성 할 수 없습니다. torlauncher.datadir_missing=Tor 데이터 디렉토리가 존재하지 않으며 생성할 수 없습니다. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=해쉬 암호을 얻어오지 못 하였습니다. torlauncher.failed_to_get_settings=Tor 설정을 찾을 수 없습니다.\n\n%S diff --git a/src/chrome/locale/lt/torlauncher.properties b/src/chrome/locale/lt/torlauncher.properties index 9c0f698..0518391 100644 --- a/src/chrome/locale/lt/torlauncher.properties +++ b/src/chrome/locale/lt/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor paleidyklė @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Nepavyksta paleisti Tor.\n\n%S torlauncher.tor_missing=Trūksta Tor vykdomojo failo. torlauncher.torrc_missing=Trūksta torrc failo ir jo nepavyko sukurti. torlauncher.datadir_missing=Nėra Tor duomenų katalogo ir nepavyko jo sukurti. +torlauncher.onionauthdir_missing=Tor onion tapatybės nustatymo katalogo nėra ir nepavyko jo sukurti. torlauncher.password_hash_missing=Nepavyko gauti maišyto slaptažodžio. torlauncher.failed_to_get_settings=Nepavyko gauti Tor nustatymų.\n\n%S diff --git a/src/chrome/locale/lv/torlauncher.properties b/src/chrome/locale/lv/torlauncher.properties index 02b1d8e..bc22322 100644 --- a/src/chrome/locale/lv/torlauncher.properties +++ b/src/chrome/locale/lv/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor palaidējs @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Nespēj startēt Tor:\n⏎\n%S torlauncher.tor_missing=Trūkst Tor'a izpildāmā moduļa. torlauncher.torrc_missing=Trūkst torrc datnes, un to nevarēja izveidot. torlauncher.datadir_missing=Tor datu direktorija nepastāv, un to nevarēja izveidot. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Neizdevās saņemt jaukto paroli. torlauncher.failed_to_get_settings=Neizdevās izgūt Tor'a iestatījumus.\n\n%S diff --git a/src/chrome/locale/mk/torlauncher.properties b/src/chrome/locale/mk/torlauncher.properties index 4055e24..7e0193e 100644 --- a/src/chrome/locale/mk/torlauncher.properties +++ b/src/chrome/locale/mk/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor стартувач @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Не може да се стартува Tor.\n\ torlauncher.tor_missing=Извршната датотека на Tor недостасува. torlauncher.torrc_missing=torrc датотеката недостасува и не може да биде создадена. torlauncher.datadir_missing=Tor податочниот директориум не постои и не може да биде создаден. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Неуспешно добивање на хаш-лозинка. torlauncher.failed_to_get_settings=Невозможно е да се добијат Tor поставки.\n\n%S diff --git a/src/chrome/locale/ml/torlauncher.properties b/src/chrome/locale/ml/torlauncher.properties index 31467ce..35f9708 100644 --- a/src/chrome/locale/ml/torlauncher.properties +++ b/src/chrome/locale/ml/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=ടോർ ഉയർത്തുന്നത് @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=ടോർ തുടങ്ങാൻ സാധി torlauncher.tor_missing=ടോർ തുടങ്ങാനുള്ള എക്സിക്യൂട്ടബിൾ കാണാനില്ല torlauncher.torrc_missing="ടോർ ആർസി" ഫയൽ കാണുന്നില്ല ഒപ്പം അതിന്റെ നിർമാണവും പരാജയപ്പെട്ടു . torlauncher.datadir_missing=ടോർ ഡാറ്റ ഡിയറക്ടറി നില നിൽക്കുന്നില്ല ഒപ്പം അത് നിർമിക്കാനും സാധിച്ചില്ല +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=ഹാഷ്ഡ് പാസ്‌വേഡ് കിട്ടുന്നതിൽ പരാജയപ്പെട്ടു torlauncher.failed_to_get_settings=ടോർ സെറ്റിംഗ്സ് കിട്ടുന്നത് സാധ്യമായില്ല diff --git a/src/chrome/locale/mr/torlauncher.properties b/src/chrome/locale/mr/torlauncher.properties index 7590077..0c7af5f 100644 --- a/src/chrome/locale/mr/torlauncher.properties +++ b/src/chrome/locale/mr/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=टॉर लाँचर @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=टॉर सुरू करण्यात अ torlauncher.tor_missing=टॉरची प्रोग्राम फाइल अनुपस्थित. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=हॅश्ड परवलीचा शब्द मिळवण्यात अपयश. torlauncher.failed_to_get_settings=टॉरच्या सेटिंग्स मिळवण्यात अपयश. diff --git a/src/chrome/locale/ms/torlauncher.properties b/src/chrome/locale/ms/torlauncher.properties index 5ffbae7..89232fa 100644 --- a/src/chrome/locale/ms/torlauncher.properties +++ b/src/chrome/locale/ms/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Pelancar Tor @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Tidak dapat memulakan Tor.\n\n%S torlauncher.tor_missing=Tor executable hilang. torlauncher.torrc_missing=Fail torrc hilang dan tidak dapat dicipta. torlauncher.datadir_missing=Direktori data Tor tidak wujud dan tidak dapat dicipta. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Gagal untuk mendapatkan kata laluan hashes. torlauncher.failed_to_get_settings=Gagal mendapatkan tetapan Tor.\n\n%S diff --git a/src/chrome/locale/my/torlauncher.properties b/src/chrome/locale/my/torlauncher.properties index 479280c..443dc34 100644 --- a/src/chrome/locale/my/torlauncher.properties +++ b/src/chrome/locale/my/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/nb-NO/network-settings.dtd b/src/chrome/locale/nb-NO/network-settings.dtd index f2e0547..6823448 100644 --- a/src/chrome/locale/nb-NO/network-settings.dtd +++ b/src/chrome/locale/nb-NO/network-settings.dtd @@ -67,10 +67,10 @@ <!ENTITY torPreferences.torSettingsDescription "Tor Browser dirigerer trafikken din over Tor-nettverket, drevet av tusenvis av frivillige rundt om i verden." > <!ENTITY torPreferences.learnMore "Lær mer"> <!ENTITY torPreferences.bridges "Broer"> -<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> +<!ENTITY torPreferences.bridgesDescription "Broer hjelper deg med å få tilgang til Tor-nettverket på steder der Tor er blokkert. Avhengig av hvor du er, kan det hende at en bro fungerer bedre enn en annen."> <!ENTITY torPreferences.useBridge "Bruk en bro"> <!ENTITY torPreferences.requestNewBridge "Forespør ny bro…"> -<!ENTITY torPreferences.provideBridge "Provide a bridge"> +<!ENTITY torPreferences.provideBridge "Gi en bro"> <!ENTITY torPreferences.advanced "Avansert"> <!ENTITY torPreferences.advancedDescription "Konfigurer hvordan Tor Browser kobles til internett."> <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> diff --git a/src/chrome/locale/nb-NO/torlauncher.properties b/src/chrome/locale/nb-NO/torlauncher.properties index 35bb8fe..a00cde2 100644 --- a/src/chrome/locale/nb-NO/torlauncher.properties +++ b/src/chrome/locale/nb-NO/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor-oppstarteren @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Kunne ikke starte Tor.\n\n%S torlauncher.tor_missing=Den kjørbare Tor-filen finnes ikke. torlauncher.torrc_missing=torrc-fila mangler og kunne ikke opprettes. torlauncher.datadir_missing=Datakatalogen til Tor finnes ikke og kunne ikke opprettes. +torlauncher.onionauthdir_missing=Tor-løk-autentiseringsmappen eksisterer ikke og kunne ikke opprettes. torlauncher.password_hash_missing=Kunne ikke hente nøkkel-passord. torlauncher.failed_to_get_settings=Kunne ikke hente Tor-innstillinger.\n\n%S diff --git a/src/chrome/locale/ne/torlauncher.properties b/src/chrome/locale/ne/torlauncher.properties index 3f45602..efa6f04 100644 --- a/src/chrome/locale/ne/torlauncher.properties +++ b/src/chrome/locale/ne/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=टोर सुरुवातकर्ता @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=टोरको सेटिङ भेटिएन diff --git a/src/chrome/locale/nl-BE/torlauncher.properties b/src/chrome/locale/nl-BE/torlauncher.properties index c65f71c..12da1d9 100644 --- a/src/chrome/locale/nl-BE/torlauncher.properties +++ b/src/chrome/locale/nl-BE/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Kan Tor niet starten.\n\n%S torlauncher.tor_missing=The Tor executable is missing. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties index e77ca7b..3580fa6 100644 --- a/src/chrome/locale/nl/torlauncher.properties +++ b/src/chrome/locale/nl/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Starter @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Kon Tor niet starten.\n\n%S torlauncher.tor_missing=Het uitvoerbare Tor-bestand ontbreekt. torlauncher.torrc_missing=Het torrc-bestand ontbreekt en kon niet worden aangemaakt. torlauncher.datadir_missing=De Tor-gegevensmap bestaat niet en kon niet worden aangemaakt. +torlauncher.onionauthdir_missing=De Tor-onion-authenticatiemap bestaat niet en kon niet worden aangemaakt. torlauncher.password_hash_missing=Ophalen van gehasht wachtwoord is mislukt. torlauncher.failed_to_get_settings=Kon Tor-instellingen niet ophalen.\n\n%S diff --git a/src/chrome/locale/nn-NO/torlauncher.properties b/src/chrome/locale/nn-NO/torlauncher.properties index 5116590..765f48c 100644 --- a/src/chrome/locale/nn-NO/torlauncher.properties +++ b/src/chrome/locale/nn-NO/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor-oppstartar @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Tor kunne ikkje starta.\n\n%S torlauncher.tor_missing=Tor køyrbar manglar. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Klarer ikkje å hente Tor-innstillingar\n\n%S diff --git a/src/chrome/locale/oc/torlauncher.properties b/src/chrome/locale/oc/torlauncher.properties index ca9774b..6ec8c40 100644 --- a/src/chrome/locale/oc/torlauncher.properties +++ b/src/chrome/locale/oc/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/pa-IN/torlauncher.properties b/src/chrome/locale/pa-IN/torlauncher.properties index 3f32724..8a8fd7f 100644 --- a/src/chrome/locale/pa-IN/torlauncher.properties +++ b/src/chrome/locale/pa-IN/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=ਟੋਰ ਲਾਂਚਰ @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=ਟੋਰ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ torlauncher.tor_missing=ਟੋਰ ਚੱਲਣਯੋਗ ਗੁੰਮ ਹੈ। torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties index 0a7d63a..7539019 100644 --- a/src/chrome/locale/pl/torlauncher.properties +++ b/src/chrome/locale/pl/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Nie można wystartować aplikacji Tor.\n\n%S torlauncher.tor_missing=Brakuje pliku wykonywalnego Tora. torlauncher.torrc_missing=Brakuje pliku torrc i nie mógł on być utworzony. torlauncher.datadir_missing=Katalog Tora nie istnieje i nie mógł być utworzony. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Nie można uzyskać hasha hasła. torlauncher.failed_to_get_settings=Nie można odzyskać ustawień Tora.\n\n%S diff --git a/src/chrome/locale/pt-BR/torlauncher.properties b/src/chrome/locale/pt-BR/torlauncher.properties index 96fa6f8..b43ea94 100644 --- a/src/chrome/locale/pt-BR/torlauncher.properties +++ b/src/chrome/locale/pt-BR/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Inicializador do Tor @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Impossível iniciar Tor. torlauncher.tor_missing=Falta o programa de execução de Tor. torlauncher.torrc_missing=O arquivo torrc está faltando e não pôde ser criado. torlauncher.datadir_missing=O diretório de dados Tor não existe e não pode ser criado. +torlauncher.onionauthdir_missing=O diretório de autenticação de onion do Tor não existe e não pôde ser criado. torlauncher.password_hash_missing=Falha ao obter a senha criptografada. torlauncher.failed_to_get_settings=Impossível recuperar as configurações de Tor. diff --git a/src/chrome/locale/pt-PT/torlauncher.properties b/src/chrome/locale/pt-PT/torlauncher.properties index 459dfbc..cd52158 100644 --- a/src/chrome/locale/pt-PT/torlauncher.properties +++ b/src/chrome/locale/pt-PT/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Não é possível iniciar o Tor.\n\n %S torlauncher.tor_missing=O executável do Tor está em falta. torlauncher.torrc_missing=O ficheiro torrc está em falta e não foi possível criá-lo. torlauncher.datadir_missing=A diretoria de dados do Tor não existe e não foi possível criá-la. +torlauncher.onionauthdir_missing=O diretório de autentição do Tor onion não existe e não foi possível criá-la. torlauncher.password_hash_missing=Não foi possível obter a palavra-passe "hashed". torlauncher.failed_to_get_settings=Não é possível obter as definições do Tor\n\n %S diff --git a/src/chrome/locale/ro/torlauncher.properties b/src/chrome/locale/ro/torlauncher.properties index dc36fb1..1fa4732 100644 --- a/src/chrome/locale/ro/torlauncher.properties +++ b/src/chrome/locale/ro/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lansator Tor @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Tor nu a putut porni.\n\n%S torlauncher.tor_missing=Fișierul executabil Tor lipsește. torlauncher.torrc_missing=Fişierul torrc lipseşte şi nu a putut fi creat. torlauncher.datadir_missing=Directorul de date Tor nu există şi nu a putut fi creat. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Eroare la obținerea hash-ului parolei. torlauncher.failed_to_get_settings=Nu s-au putut obține setările Tor.\n\n%S diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties index 86b8422..82284c1 100644 --- a/src/chrome/locale/ru/torlauncher.properties +++ b/src/chrome/locale/ru/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Загрузчик Tor @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Невозможно запустить Tor.\n\n torlauncher.tor_missing=Исполняемый файл Tor отсутствует. torlauncher.torrc_missing=torrc файл отсутствует и не может быть создан. torlauncher.datadir_missing=Директория данных Tor не существует и не может быть создана. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Не удается получить хэшированный пароль. torlauncher.failed_to_get_settings=Не удается загрузить настройки Tor.\n\n%S diff --git a/src/chrome/locale/si/torlauncher.properties b/src/chrome/locale/si/torlauncher.properties index 15c4457..b434d3e 100644 --- a/src/chrome/locale/si/torlauncher.properties +++ b/src/chrome/locale/si/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor පුරනය @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Tor ආරම්භ කිරීමට නොහ torlauncher.tor_missing=Tor විධානය අස්ථානගත වී ඇත. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=පුරණය කරනලද මුරපදය ලබාගැනීමට අපොහොසත්ය. torlauncher.failed_to_get_settings=Tor සිටුවම් සොයා ලබාගැනීමට අපොහොසත්ය.\n\n%S diff --git a/src/chrome/locale/sk/torlauncher.properties b/src/chrome/locale/sk/torlauncher.properties index 548e598..4b01fcc 100644 --- a/src/chrome/locale/sk/torlauncher.properties +++ b/src/chrome/locale/sk/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Spúšťač Tor @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Nie je možné spustiť Tor.\n\n%S torlauncher.tor_missing=Spustiteľný súbor programu Tor chýba. torlauncher.torrc_missing=Chýba súbor torrc a nemohol byť vytvorený. torlauncher.datadir_missing=Priečinok pre dáta Tor neexistuje a nemohol byť vytvorený. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Nepodarilo sa získať zabezpečené heslo. torlauncher.failed_to_get_settings=Nie je možné prijať nastavenia Tor.\n\n%S diff --git a/src/chrome/locale/sl/torlauncher.properties b/src/chrome/locale/sl/torlauncher.properties index 52ff921..0d2c360 100644 --- a/src/chrome/locale/sl/torlauncher.properties +++ b/src/chrome/locale/sl/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor zaganjalnik @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Tor se ne more zagnati.\n\n%S torlauncher.tor_missing=Manjka Torova izvršljiva datoteka. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Spodletelo pridobivanje zgoščene vrednosti gesla. torlauncher.failed_to_get_settings=Ni uspela pridobitev Tor nastavitev.\n\n%S diff --git a/src/chrome/locale/sq/torlauncher.properties b/src/chrome/locale/sq/torlauncher.properties index 3eb118f..613f20d 100644 --- a/src/chrome/locale/sq/torlauncher.properties +++ b/src/chrome/locale/sq/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lëshuesi Tor @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=E pamundur që të niset Tor.\n\n%S torlauncher.tor_missing=Skedari i ekzekutueshëm Tor, mungon. torlauncher.torrc_missing=Skedari torrc mungon dhe s'mund të krijohet. torlauncher.datadir_missing=Të dhënat e direktorisë Tor data nuk ekzistojnë dhe s'mund të krijohen. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Dështuam të përftonim fjalëkalimin me thurje. torlauncher.failed_to_get_settings=Dështuam të gjenim konfigurimin e Tor.\n\n%S diff --git a/src/chrome/locale/sr/torlauncher.properties b/src/chrome/locale/sr/torlauncher.properties index 653ec9d..bc8f088 100644 --- a/src/chrome/locale/sr/torlauncher.properties +++ b/src/chrome/locale/sr/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Тоr Покретач @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Тоr се не може покренути\n\n% torlauncher.tor_missing=Tor извршни фајл недостаје torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Узимање хеширане лозинке није успело torlauncher.failed_to_get_settings=Немогућност повратка Tor подешавања\n\n%Ѕ diff --git a/src/chrome/locale/sv-SE/torlauncher.properties b/src/chrome/locale/sv-SE/torlauncher.properties index ad4f438..d89feaf 100644 --- a/src/chrome/locale/sv-SE/torlauncher.properties +++ b/src/chrome/locale/sv-SE/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Kan inte starta Tor.\n\n%S torlauncher.tor_missing=Tors körbara programfil saknas. torlauncher.torrc_missing=Torrc-fil saknas och kunde inte skapas. torlauncher.datadir_missing=Tor-datakatalog finns inte och kunde inte skapas. +torlauncher.onionauthdir_missing=Autentiseringskatalogen Tor onion finns inte och kunde inte skapas. torlauncher.password_hash_missing=Det gick inte att få hashat lösenord. torlauncher.failed_to_get_settings=Kunde inte läsa in inställningar för Tor.\n\n%S diff --git a/src/chrome/locale/sw/torlauncher.properties b/src/chrome/locale/sw/torlauncher.properties index 119d991..82e6d2e 100644 --- a/src/chrome/locale/sw/torlauncher.properties +++ b/src/chrome/locale/sw/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/ta/torlauncher.properties b/src/chrome/locale/ta/torlauncher.properties index 827e7c7..b9a7c29 100644 --- a/src/chrome/locale/ta/torlauncher.properties +++ b/src/chrome/locale/ta/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor துவக்கி @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Tor தொடங்க முடியவி torlauncher.tor_missing=Tor இயங்கக்கூடியது காணவில்லை. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Hashed கடவுச்சொல்லை பெற முடியவில்லை. torlauncher.failed_to_get_settings=Tor அமைப்புகளை மீட்டெடுக்க முடியவில்லை.\n\n%S diff --git a/src/chrome/locale/te/torlauncher.properties b/src/chrome/locale/te/torlauncher.properties index 8fdef0f..2f17d55 100644 --- a/src/chrome/locale/te/torlauncher.properties +++ b/src/chrome/locale/te/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/th/torlauncher.properties b/src/chrome/locale/th/torlauncher.properties index 5c97813..6a4fdf9 100644 --- a/src/chrome/locale/th/torlauncher.properties +++ b/src/chrome/locale/th/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=ตัวเปิด Tor @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=ไม่สามารถเริ่มกา torlauncher.tor_missing=แฟ้มโปรแกรม Tor ขาดหายไป torlauncher.torrc_missing=ไฟล์ torrc หายไปและไม่สามารถสร้างได้ torlauncher.datadir_missing=ไม่มีข้อมูลไดเรกทอรีของ Tor และไม่สามารถสร้างได้ +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=ล้มเหลวในการเรียกรหัสผ่านที่ถูกแฮช torlauncher.failed_to_get_settings=ไม่สามารถเรียกคืนการตั้งค่า Tor ได้\n\n%S diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties index 0a9dbb7..6055fe4 100644 --- a/src/chrome/locale/tr/torlauncher.properties +++ b/src/chrome/locale/tr/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Başlatıcı @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Tor başlatılamadı.\n\n%S torlauncher.tor_missing=Çalıştırılabilecek Tor dosyası bulunamadı. torlauncher.torrc_missing="Torcc" dosyası eksik ve oluşturulamadı. torlauncher.datadir_missing=Tor veri klasörü bulunamadı ve oluşturulamadı. +torlauncher.onionauthdir_missing=Tor onion kimlik doğrulama klasörü bulunamadı ve oluşturulamadı. torlauncher.password_hash_missing=Karılmış parola alınamadı. torlauncher.failed_to_get_settings=Tor ayarları alınamadı.\n\n%S diff --git a/src/chrome/locale/uk/torlauncher.properties b/src/chrome/locale/uk/torlauncher.properties index 3861593..c9077c8 100644 --- a/src/chrome/locale/uk/torlauncher.properties +++ b/src/chrome/locale/uk/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Завантажувач Tor @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Неможливо запустити Tor.\n\n%S torlauncher.tor_missing=Виконуваний файл Tor відсутній. torlauncher.torrc_missing=Файл torrc відсутній та не може бути створена. torlauncher.datadir_missing=Директорія для даних Tor не існує і не може бути створена. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Не вдалося отримати хеширований пароль. torlauncher.failed_to_get_settings=Не вдалося отримати налаштування Tor.\n\n%S diff --git a/src/chrome/locale/ur/torlauncher.properties b/src/chrome/locale/ur/torlauncher.properties index 836b6f7..9eb94dd 100644 --- a/src/chrome/locale/ur/torlauncher.properties +++ b/src/chrome/locale/ur/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=ٹار لانچر @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=ٹار کو نہیں چلایا جا سکتا۔\ torlauncher.tor_missing=ٹار چلانے والی ایگزیکیوٹیبل فائل غائب ہے۔ torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=ٹار ترتیبات کو حاصل نہیں کیا جا سکا۔\n\n%S diff --git a/src/chrome/locale/uz/torlauncher.properties b/src/chrome/locale/uz/torlauncher.properties index 7d25471..e13c6ce 100644 --- a/src/chrome/locale/uz/torlauncher.properties +++ b/src/chrome/locale/uz/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/vi/torlauncher.properties b/src/chrome/locale/vi/torlauncher.properties index cb6ed17..ed37db1 100644 --- a/src/chrome/locale/vi/torlauncher.properties +++ b/src/chrome/locale/vi/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Trình khởi chạy Tor @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Không thể khởi động Tor.\n\n%S torlauncher.tor_missing=Tập tin thực thi của Tor bị thiếu. torlauncher.torrc_missing=Tập tin torrc đang bị thiếu và không thể tạo. torlauncher.datadir_missing=Thư mục dữ liệu của Tor không tồn tại và không thể tạo. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Thất bại khi lấy mật khẩu đã được băm. torlauncher.failed_to_get_settings=Không thể nhận được cài đặt Tor. diff --git a/src/chrome/locale/zh-CN/torlauncher.properties b/src/chrome/locale/zh-CN/torlauncher.properties index ef2c93c..4f5e1d6 100644 --- a/src/chrome/locale/zh-CN/torlauncher.properties +++ b/src/chrome/locale/zh-CN/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor 启动器 @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=无法启动 Tor。\n\n%S torlauncher.tor_missing=缺少 Tor 可执行文件。 torlauncher.torrc_missing=torrc 文件丢失且无法被创建。 torlauncher.datadir_missing=Tor 数据目录不存在且无法被创建。 +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=无法获取哈希密码。 torlauncher.failed_to_get_settings=无法获取 Tor 设置。\n\n%S diff --git a/src/chrome/locale/zh-HK/torlauncher.properties b/src/chrome/locale/zh-HK/torlauncher.properties index f41117e..12ed3d5 100644 --- a/src/chrome/locale/zh-HK/torlauncher.properties +++ b/src/chrome/locale/zh-HK/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor洋蔥路由啟動器 @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=無法啟動Tor洋蔥路由。\n\n%S torlauncher.tor_missing=遺失Tor洋蔥路由嘅執行檔。 torlauncher.torrc_missing=遺失Torrc檔案，並且無法建立。 torlauncher.datadir_missing=Tor洋蔥路由嘅資料夾路徑不存在，並且無法建立。 +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=無法取得驗證碼嘅密碼。 torlauncher.failed_to_get_settings=無法取得Tor洋蔥路由設定\n\n%S diff --git a/src/chrome/locale/zh-TW/torlauncher.properties b/src/chrome/locale/zh-TW/torlauncher.properties index 47124e5..3a7613c 100644 --- a/src/chrome/locale/zh-TW/torlauncher.properties +++ b/src/chrome/locale/zh-TW/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=洋蔥路由啟動工具 @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=無法啟動洋蔥路由。\n\n%S torlauncher.tor_missing=洋蔥路由可執行檔遺失。 torlauncher.torrc_missing=洋蔥路由的配置文件遺失而且無法創建。 torlauncher.datadir_missing=洋蔥路由的資料夾不存在，且無法被創建。 +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=無法取得雜湊過的密碼。 torlauncher.failed_to_get_settings=無法擷取洋蔥路由設定。\n\n%S

1 0

[torbutton/master] Translations update (including new strings)
by sysrqb＠torproject.org 03 Mar '20

03 Mar '20

commit a3cd239df2c2817b6bd58a58514e8e0d1795b4bf Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Mar 3 20:14:36 2020 +0000 Translations update (including new strings) --- chrome/locale/ar/torbutton.dtd | 1 + chrome/locale/ar/torbutton.properties | 12 ++++++++++++ chrome/locale/bn-BD/torbutton.dtd | 1 + chrome/locale/bn-BD/torbutton.properties | 12 ++++++++++++ chrome/locale/ca/torbutton.dtd | 1 + chrome/locale/ca/torbutton.properties | 12 ++++++++++++ chrome/locale/cs/torbutton.dtd | 1 + chrome/locale/cs/torbutton.properties | 12 ++++++++++++ chrome/locale/da/torbutton.dtd | 1 + chrome/locale/da/torbutton.properties | 12 ++++++++++++ chrome/locale/de/torbutton.dtd | 1 + chrome/locale/de/torbutton.properties | 12 ++++++++++++ chrome/locale/el/torbutton.dtd | 1 + chrome/locale/el/torbutton.properties | 12 ++++++++++++ chrome/locale/es-AR/torbutton.dtd | 1 + chrome/locale/es-AR/torbutton.properties | 12 ++++++++++++ chrome/locale/es-ES/torbutton.dtd | 1 + chrome/locale/es-ES/torbutton.properties | 12 ++++++++++++ chrome/locale/eu/torbutton.dtd | 1 + chrome/locale/eu/torbutton.properties | 12 ++++++++++++ chrome/locale/fa/torbutton.dtd | 1 + chrome/locale/fa/torbutton.properties | 12 ++++++++++++ chrome/locale/fr/torbutton.dtd | 1 + chrome/locale/fr/torbutton.properties | 12 ++++++++++++ chrome/locale/ga-IE/torbutton.dtd | 1 + chrome/locale/ga-IE/torbutton.properties | 12 ++++++++++++ chrome/locale/he/torbutton.dtd | 1 + chrome/locale/he/torbutton.properties | 12 ++++++++++++ chrome/locale/hu/torbutton.dtd | 1 + chrome/locale/hu/torbutton.properties | 12 ++++++++++++ chrome/locale/id/torbutton.dtd | 1 + chrome/locale/id/torbutton.properties | 12 ++++++++++++ chrome/locale/is/torbutton.dtd | 1 + chrome/locale/is/torbutton.properties | 12 ++++++++++++ chrome/locale/it/torbutton.dtd | 1 + chrome/locale/it/torbutton.properties | 12 ++++++++++++ chrome/locale/ja/torbutton.dtd | 1 + chrome/locale/ja/torbutton.properties | 12 ++++++++++++ chrome/locale/ka/torbutton.dtd | 1 + chrome/locale/ka/torbutton.properties | 12 ++++++++++++ chrome/locale/ko/torbutton.dtd | 1 + chrome/locale/ko/torbutton.properties | 12 ++++++++++++ chrome/locale/lt/torbutton.dtd | 1 + chrome/locale/lt/torbutton.properties | 12 ++++++++++++ chrome/locale/mk/torbutton.dtd | 1 + chrome/locale/mk/torbutton.properties | 12 ++++++++++++ chrome/locale/ms/torbutton.dtd | 1 + chrome/locale/ms/torbutton.properties | 12 ++++++++++++ chrome/locale/nb-NO/torbutton.dtd | 1 + chrome/locale/nb-NO/torbutton.properties | 12 ++++++++++++ chrome/locale/nl/torbutton.dtd | 1 + chrome/locale/nl/torbutton.properties | 12 ++++++++++++ chrome/locale/pl/torbutton.dtd | 1 + chrome/locale/pl/torbutton.properties | 12 ++++++++++++ chrome/locale/pt-BR/torbutton.dtd | 1 + chrome/locale/pt-BR/torbutton.properties | 12 ++++++++++++ chrome/locale/ro/torbutton.dtd | 1 + chrome/locale/ro/torbutton.properties | 12 ++++++++++++ chrome/locale/ru/torbutton.dtd | 1 + chrome/locale/ru/torbutton.properties | 12 ++++++++++++ chrome/locale/sv-SE/torbutton.dtd | 1 + chrome/locale/sv-SE/torbutton.properties | 12 ++++++++++++ chrome/locale/th/torbutton.dtd | 1 + chrome/locale/th/torbutton.properties | 12 ++++++++++++ chrome/locale/tr/torbutton.dtd | 1 + chrome/locale/tr/torbutton.properties | 12 ++++++++++++ chrome/locale/vi/torbutton.dtd | 1 + chrome/locale/vi/torbutton.properties | 12 ++++++++++++ chrome/locale/zh-CN/torbutton.dtd | 1 + chrome/locale/zh-CN/torbutton.properties | 12 ++++++++++++ chrome/locale/zh-TW/torbutton.dtd | 1 + chrome/locale/zh-TW/torbutton.properties | 12 ++++++++++++ 72 files changed, 468 insertions(+) diff --git a/chrome/locale/ar/torbutton.dtd b/chrome/locale/ar/torbutton.dtd index 0f63af50..bf8a43a3 100644 --- a/chrome/locale/ar/torbutton.dtd +++ b/chrome/locale/ar/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "فتح مُنبّه استيثاق على عميل خدمة البصلة أو Onion Service"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> diff --git a/chrome/locale/ar/torbutton.properties b/chrome/locale/ar/torbutton.properties index 01de9a59..5a4ff34d 100644 --- a/chrome/locale/ar/torbutton.properties +++ b/chrome/locale/ar/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=الاتصال معمى (خدمة بصلة) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=تعرف على المزيد onionServices.clientAuthMissing=ينقص خدمة البصلة من تور استيثاق للعميل onionServices.authPrompt.description=%S يطلب المفتاح الخاص بكم onionServices.authPrompt.keyPlaceholder=يرجى إدخال المفتاح الخاص لخدمة البصلة هذه @@ -68,3 +69,14 @@ onionServices.authPrompt.done=انتهى onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=يرجى إدخال مفتاح صالح (قاعدة٥٢ ب ٣٢ رمز أو قاعدة٤٤ ب ٦٤ رمز) onionServices.authPrompt.failedToSetKey=لا يمكن إعدادا تور باستخدام مفتاحكم +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=مفتاح +onionServices.authPreferences.remove=حذف +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key diff --git a/chrome/locale/bn-BD/torbutton.dtd b/chrome/locale/bn-BD/torbutton.dtd index d9579cff..6e06a21e 100644 --- a/chrome/locale/bn-BD/torbutton.dtd +++ b/chrome/locale/bn-BD/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "onion সার্ভিস ক্লায়েন্টের অথেনটিকেশন প্রম্পটটি খুলুন"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> diff --git a/chrome/locale/bn-BD/torbutton.properties b/chrome/locale/bn-BD/torbutton.properties index 1ff0a8e1..aacb95dd 100644 --- a/chrome/locale/bn-BD/torbutton.properties +++ b/chrome/locale/bn-BD/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=সংযোগ এনক্রিপ্ট (Onion Serv # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=আরও জানুন onionServices.clientAuthMissing=Tor onion পরিষেবা ক্লায়েন্টের অনুমোদন হারিয়েছে onionServices.authPrompt.description=%S আপনার ব্যক্তিগত কীটির জন্য অনুরোধ করছে। onionServices.authPrompt.keyPlaceholder=এই onion পরিষেবার জন্য আপনার ব্যক্তিগত কী লিখুন @@ -68,3 +69,14 @@ onionServices.authPrompt.done=সম্পন্ন onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=দয়া করে একটি বৈধ কী (52 বেস32 অক্ষর বা 44 বেস 64 অক্ষর) প্রবেশ করুন onionServices.authPrompt.failedToSetKey=আপনার কী দিয়ে টর কনফিগার করতে অক্ষম +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=কি +onionServices.authPreferences.remove=অপসারণ +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key diff --git a/chrome/locale/ca/torbutton.dtd b/chrome/locale/ca/torbutton.dtd index f82055ec..89ac4167 100644 --- a/chrome/locale/ca/torbutton.dtd +++ b/chrome/locale/ca/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> diff --git a/chrome/locale/ca/torbutton.properties b/chrome/locale/ca/torbutton.properties index c96b5ebe..294e2e21 100644 --- a/chrome/locale/ca/torbutton.properties +++ b/chrome/locale/ca/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Connexió xifrada (Onion Service) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Més informació onionServices.clientAuthMissing=Tor onion service missing client authorization onionServices.authPrompt.description=%S is requesting your private key. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Fet onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=Clau +onionServices.authPreferences.remove=Suprimeix la subscripció +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key diff --git a/chrome/locale/cs/torbutton.dtd b/chrome/locale/cs/torbutton.dtd index a2a4109c..b55de660 100644 --- a/chrome/locale/cs/torbutton.dtd +++ b/chrome/locale/cs/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Otevřít výzvu k ověření klienta služby onion"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> diff --git a/chrome/locale/cs/torbutton.properties b/chrome/locale/cs/torbutton.properties index 20e5c747..56f5c2ad 100644 --- a/chrome/locale/cs/torbutton.properties +++ b/chrome/locale/cs/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Šifrované spojení (Onion služba) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Zjistit více onionServices.clientAuthMissing=Tor klient služby onion není ověřený onionServices.authPrompt.description=%S vyžaduje váš soukromý klíč. onionServices.authPrompt.keyPlaceholder=Zadejte svůj soukromý klíč pro tuto službu onion @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Hotovo onionServices.authPrompt.doneAccessKey=H onionServices.authPrompt.invalidKey=Zadejte prosím platný klíč (52 znaků base32, nebo 44 znaků base64) onionServices.authPrompt.failedToSetKey=Tor s vaším klíčem nelze nastavit +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=Klíč +onionServices.authPreferences.remove=Odstranit +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key diff --git a/chrome/locale/da/torbutton.dtd b/chrome/locale/da/torbutton.dtd index 5194c55a..d305193e 100644 --- a/chrome/locale/da/torbutton.dtd +++ b/chrome/locale/da/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Åbn prompt til klientautentifikation af oniontjeneste"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Husk nøglen"> diff --git a/chrome/locale/da/torbutton.properties b/chrome/locale/da/torbutton.properties index 9ef8dc27..e38e384a 100644 --- a/chrome/locale/da/torbutton.properties +++ b/chrome/locale/da/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Forbindelse krypteret (oniontjeneste) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Lær mere onionServices.clientAuthMissing=Tor-oniontjeneste mangler klient autentifikation onionServices.authPrompt.description=%S anmoder om din private nøgle. onionServices.authPrompt.keyPlaceholder=Indtast din private nøgle til oniontjenesten @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Fuldført onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Indtast venligst en gyldig nøgle (52 base32-tegn eller 44 base64-tegn) onionServices.authPrompt.failedToSetKey=Kan ikke konfigurere Tor med din nøgle +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Gemmer nøgler … +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsted +onionServices.authPreferences.onionKey=Nøgle +onionServices.authPreferences.remove=Fjern +onionServices.authPreferences.removeAll=Fjern alle +onionServices.authPreferences.failedToGetKeys=Kan ikke hente nøgler fra tor +onionServices.authPreferences.failedToRemoveKey=Kan ikke fjerne nøgle diff --git a/chrome/locale/de/torbutton.dtd b/chrome/locale/de/torbutton.dtd index 78c11283..86266aa5 100644 --- a/chrome/locale/de/torbutton.dtd +++ b/chrome/locale/de/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Aufforderung zur Bestätigung an verfügbares Onion-Dienst-Klienten-Programm"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Diesen Schlüssel merken"> diff --git a/chrome/locale/de/torbutton.properties b/chrome/locale/de/torbutton.properties index ac756ac2..a1179ba3 100644 --- a/chrome/locale/de/torbutton.properties +++ b/chrome/locale/de/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Verbindung verschlüsselt (Onion-Dienst) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Mehr erfahren onionServices.clientAuthMissing=Dem Onion-Dienst fehlt die Client-Autorisierung. onionServices.authPrompt.description=%S fragt deinen privaten Schlüssel an. onionServices.authPrompt.keyPlaceholder=Gib deinen privaten Schlüssel für diesen Onion-Dienst ein. @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Fertig onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Bitte gib einen gültigen Schlüssel (52 base32-Zeichen oder 44 base64-Zeichen) ein. onionServices.authPrompt.failedToSetKey=Das Konfigurieren von Tor mit deinem Schlüssel ist nicht möglich. +onionServices.authPreferences.header=Onion Dienste-Bestätigung +onionServices.authPreferences.overview=Einige Onion-Dienste verlangen, dass du dich mit einem Schlüssel (eine Art Passwort) identifizierst, bevor du auf sie zugreifen kannst. +onionServices.authPreferences.savedKeys=Gespeicherte Schlüssel … +onionServices.authPreferences.dialogTitle=Onion-Dienst-Schlüssel +onionServices.authPreferences.dialogIntro=Die Schlüssel für die folgenden Onion-Seiten sind auf deinem Computer gespeichert +onionServices.authPreferences.onionSite=Onion-Seite +onionServices.authPreferences.onionKey=Schlüssel +onionServices.authPreferences.remove=Entfernen +onionServices.authPreferences.removeAll=Alles entfernen +onionServices.authPreferences.failedToGetKeys=Abrufen der Schlüssel von Tor nicht möglich +onionServices.authPreferences.failedToRemoveKey=Schlüssel entfernen nicht möglich diff --git a/chrome/locale/el/torbutton.dtd b/chrome/locale/el/torbutton.dtd index 73821dc9..7da8a97a 100644 --- a/chrome/locale/el/torbutton.dtd +++ b/chrome/locale/el/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> diff --git a/chrome/locale/el/torbutton.properties b/chrome/locale/el/torbutton.properties index 7dc3aff2..31b9811a 100644 --- a/chrome/locale/el/torbutton.properties +++ b/chrome/locale/el/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Κρυπτογραφημένη σύνδεση (υπηρ # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Μάθετε περισσότερα onionServices.clientAuthMissing=Tor onion service missing client authorization onionServices.authPrompt.description=%S is requesting your private key. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Τέλος onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=Κλειδί +onionServices.authPreferences.remove=Απομάκρυνση +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key diff --git a/chrome/locale/es-AR/torbutton.dtd b/chrome/locale/es-AR/torbutton.dtd index f9353af2..757cca3e 100644 --- a/chrome/locale/es-AR/torbutton.dtd +++ b/chrome/locale/es-AR/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> diff --git a/chrome/locale/es-AR/torbutton.properties b/chrome/locale/es-AR/torbutton.properties index 8297742c..a57fe359 100644 --- a/chrome/locale/es-AR/torbutton.properties +++ b/chrome/locale/es-AR/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Conexión encriptada (Servicio Onion) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Aprendé más onionServices.clientAuthMissing=Tor onion service missing client authorization onionServices.authPrompt.description=%S is requesting your private key. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Hecho onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=Clave criptográfica +onionServices.authPreferences.remove=Remover +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key diff --git a/chrome/locale/es-ES/torbutton.dtd b/chrome/locale/es-ES/torbutton.dtd index 0182fec6..9766a7da 100644 --- a/chrome/locale/es-ES/torbutton.dtd +++ b/chrome/locale/es-ES/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Abre el cliente de autentificación de servicios onion"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Recuerda esta clave"> diff --git a/chrome/locale/es-ES/torbutton.properties b/chrome/locale/es-ES/torbutton.properties index c15b11e0..6ca73b1e 100644 --- a/chrome/locale/es-ES/torbutton.properties +++ b/chrome/locale/es-ES/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Conexión cifrada (Servicio cebolla) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Conocer más onionServices.clientAuthMissing=Servicio onion sin autorización de cliente onionServices.authPrompt.description=%S está solicitando tu clave privada. onionServices.authPrompt.keyPlaceholder=Introduce tu clave privada para este servicio cebolla @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Listo onionServices.authPrompt.doneAccessKey=r onionServices.authPrompt.invalidKey=Introduce una clave válida (52 caracteres base32 o 44 caracteres base64) onionServices.authPrompt.failedToSetKey=Imposible configurar Tor con tu clave +onionServices.authPreferences.header=Autenticación de Servicios Cebolla +onionServices.authPreferences.overview=Algunos de los servicios de cebolla necesitan que te identifiques con una clave (un tipo de contraseña) antes de poder acceder a ellos. +onionServices.authPreferences.savedKeys=Guardar clave +onionServices.authPreferences.dialogTitle=Claves de Servicio de Cebolla +onionServices.authPreferences.dialogIntro=Claves para los siguientes sitios de cebolla se almacenan en tu ordenador. +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=Clave +onionServices.authPreferences.remove=Eliminar +onionServices.authPreferences.removeAll=Eliminar todo +onionServices.authPreferences.failedToGetKeys=No se pueden recuperar las claves de Tor +onionServices.authPreferences.failedToRemoveKey=No se puede quitar la clave diff --git a/chrome/locale/eu/torbutton.dtd b/chrome/locale/eu/torbutton.dtd index eee9cb90..1af7c119 100644 --- a/chrome/locale/eu/torbutton.dtd +++ b/chrome/locale/eu/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> diff --git a/chrome/locale/eu/torbutton.properties b/chrome/locale/eu/torbutton.properties index 3cf80231..39984c4e 100644 --- a/chrome/locale/eu/torbutton.properties +++ b/chrome/locale/eu/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Enkriptatutako konexioa (Onion zerbitzua) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Gehiago jakin onionServices.clientAuthMissing=Tor onion service missing client authorization onionServices.authPrompt.description=%S is requesting your private key. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Eginda onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=Gakoa +onionServices.authPreferences.remove=Kendu +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key diff --git a/chrome/locale/fa/torbutton.dtd b/chrome/locale/fa/torbutton.dtd index 65e1af10..504e6576 100644 --- a/chrome/locale/fa/torbutton.dtd +++ b/chrome/locale/fa/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "اعلان احراز هویت مشتری در سرویس Onion را باز کن"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> diff --git a/chrome/locale/fa/torbutton.properties b/chrome/locale/fa/torbutton.properties index 460d3a2e..6bc2850d 100644 --- a/chrome/locale/fa/torbutton.properties +++ b/chrome/locale/fa/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=ارتباط رمزگذاری شد (سرویس پیاز # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=اطلاعات بیشتر onionServices.clientAuthMissing=سرویس Onion در Tor، مجوز مشتری را پیدا نمی‌کند. onionServices.authPrompt.description=%S درخواست کلید خصوصی شما را دارد. onionServices.authPrompt.keyPlaceholder=کلید خصوصی خود برای این سرویس Onion را، وارد کنید. @@ -68,3 +69,14 @@ onionServices.authPrompt.done=انجام شد onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=لطفا یک کلید معتبر وارد نمایید( 52 کاراکتر در مبنای 32 یا 44 کاراکتر در مبنای 64) onionServices.authPrompt.failedToSetKey=امکان پیکر‌بندی Tor با کلید شما وجود ندارد +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=کلید +onionServices.authPreferences.remove=حذف +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key diff --git a/chrome/locale/fr/torbutton.dtd b/chrome/locale/fr/torbutton.dtd index 89b92a6c..0327aa48 100644 --- a/chrome/locale/fr/torbutton.dtd +++ b/chrome/locale/fr/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Ouvrir l’invite d’authentification du client du service onion"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Mémoriser cette clé"> diff --git a/chrome/locale/fr/torbutton.properties b/chrome/locale/fr/torbutton.properties index a59f541f..70bde61c 100644 --- a/chrome/locale/fr/torbutton.properties +++ b/chrome/locale/fr/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=La connexion est chiffrée (service onion) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=En savoir plus onionServices.clientAuthMissing=L’autorisation du client manque au service onion Tor onionServices.authPrompt.description=%S demande votre clé privée. onionServices.authPrompt.keyPlaceholder=Saisissez votre clé privée pour ce service onion @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Terminé onionServices.authPrompt.doneAccessKey=t onionServices.authPrompt.invalidKey=Veuillez saisir une clé valide (52 caractères Base32 ou 44 caractères Base64) onionServices.authPrompt.failedToSetKey=Impossible de configurer Tor avec votre clé +onionServices.authPreferences.header=Authentification des services onion +onionServices.authPreferences.overview=Certains services onion exigent que vous vous authentifiiez avec une clé (une sorte de mot de passe) avant de pouvoir y accéder. +onionServices.authPreferences.savedKeys=Clés enregistrées… +onionServices.authPreferences.dialogTitle=Clés des services onion +onionServices.authPreferences.dialogIntro=Les clés pour les sites onion suivants sont enregistrées sur votre ordinateur +onionServices.authPreferences.onionSite=Site onion +onionServices.authPreferences.onionKey=Clé +onionServices.authPreferences.remove=Supprimer +onionServices.authPreferences.removeAll=Tout supprimer +onionServices.authPreferences.failedToGetKeys=Impossible de récupérer les clés de Tor +onionServices.authPreferences.failedToRemoveKey=Impossible de supprimer la clé diff --git a/chrome/locale/ga-IE/torbutton.dtd b/chrome/locale/ga-IE/torbutton.dtd index 72bbb627..dbca0894 100644 --- a/chrome/locale/ga-IE/torbutton.dtd +++ b/chrome/locale/ga-IE/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> diff --git a/chrome/locale/ga-IE/torbutton.properties b/chrome/locale/ga-IE/torbutton.properties index da5deada..74e76499 100644 --- a/chrome/locale/ga-IE/torbutton.properties +++ b/chrome/locale/ga-IE/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Ceangal Criptithe (Seirbhís Onion) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Tuilleadh eolais onionServices.clientAuthMissing=Tor onion service missing client authorization onionServices.authPrompt.description=%S is requesting your private key. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Déanta onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=Eochair +onionServices.authPreferences.remove=Bain +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key diff --git a/chrome/locale/he/torbutton.dtd b/chrome/locale/he/torbutton.dtd index 3591d737..2c961c61 100644 --- a/chrome/locale/he/torbutton.dtd +++ b/chrome/locale/he/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "פתח ידוע אימות לקוח של שירות בצל"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "זכור מפתח זה"> diff --git a/chrome/locale/he/torbutton.properties b/chrome/locale/he/torbutton.properties index 033641ae..7ce4502f 100644 --- a/chrome/locale/he/torbutton.properties +++ b/chrome/locale/he/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=חיבור הוצפן (שירות בצל) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=למד עוד onionServices.clientAuthMissing=לשירות בצל של Tor חסר אימות לקוח onionServices.authPrompt.description=%S מבקש את המפתח הפרטי שלך. onionServices.authPrompt.keyPlaceholder=הכנס את המפתח הפרטי שלך עבור שירות בצל זה @@ -68,3 +69,14 @@ onionServices.authPrompt.done=סיים onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=אנא הכנס מפתח תקף (52 תווים של base32 או 44 תווים של base64) onionServices.authPrompt.failedToSetKey=לא היה ניתן לתצר את Tor עם המפתח שלך +onionServices.authPreferences.header=אימות שירותי בצל +onionServices.authPreferences.overview=מספר שירותי בצל דורשים שתזהה את עצמך עם מפתח (סוג של סיסמה) לפני שתוכל להשיג אליהם גישה. +onionServices.authPreferences.savedKeys=מפתחות שמורים… +onionServices.authPreferences.dialogTitle=מפתחות שירות בצל +onionServices.authPreferences.dialogIntro=מפתחות עבור אתרי הבצל הבאים מאוחסנים במחשב שלך +onionServices.authPreferences.onionSite=אתר בצל +onionServices.authPreferences.onionKey=מפתח +onionServices.authPreferences.remove=הסר +onionServices.authPreferences.removeAll=הסר הכל +onionServices.authPreferences.failedToGetKeys=לא היה ניתן לאחזר מפתחות מן tor +onionServices.authPreferences.failedToRemoveKey=לא היה ניתן להסיר מפתח diff --git a/chrome/locale/hu/torbutton.dtd b/chrome/locale/hu/torbutton.dtd index 452b36a1..2f650d52 100644 --- a/chrome/locale/hu/torbutton.dtd +++ b/chrome/locale/hu/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> diff --git a/chrome/locale/hu/torbutton.properties b/chrome/locale/hu/torbutton.properties index cb3a690f..a62210c0 100644 --- a/chrome/locale/hu/torbutton.properties +++ b/chrome/locale/hu/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Titkosított kapcsolat (Onion szolgáltatás) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=További információ onionServices.clientAuthMissing=Tor onion service missing client authorization onionServices.authPrompt.description=%S is requesting your private key. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Kész onionServices.authPrompt.doneAccessKey=a onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=Kulcs +onionServices.authPreferences.remove=Eltávolít +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key diff --git a/chrome/locale/id/torbutton.dtd b/chrome/locale/id/torbutton.dtd index 6331c861..8c417871 100644 --- a/chrome/locale/id/torbutton.dtd +++ b/chrome/locale/id/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Buka permintaan otentikasi klien oninon service"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> diff --git a/chrome/locale/id/torbutton.properties b/chrome/locale/id/torbutton.properties index 66a8e596..f8fc752e 100644 --- a/chrome/locale/id/torbutton.properties +++ b/chrome/locale/id/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Koneksi terenkripsi (Layanan Onion) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Pelajari Selengkapnya onionServices.clientAuthMissing=Tor onion service missing client authorization onionServices.authPrompt.description=%S is requesting your private key. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Selesai onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=Kunci +onionServices.authPreferences.remove=Hapus +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key diff --git a/chrome/locale/is/torbutton.dtd b/chrome/locale/is/torbutton.dtd index 3f998e5c..7b013603 100644 --- a/chrome/locale/is/torbutton.dtd +++ b/chrome/locale/is/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Opna glugga fyrir auðkenningu biðlaraforrits fyrir onion-þjónustu"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Mundu þennan lykil"> diff --git a/chrome/locale/is/torbutton.properties b/chrome/locale/is/torbutton.properties index d29cb711..feb50ffa 100644 --- a/chrome/locale/is/torbutton.properties +++ b/chrome/locale/is/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Dulrituð tenging (Onion-þjónusta) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Fræðast frekar onionServices.clientAuthMissing=Tor onion-þjónustu vantar auðkenningu frá biðlaraforriti onionServices.authPrompt.description=%S er að biðja um einkalykilinn þinn. onionServices.authPrompt.keyPlaceholder=Settu inn einkalykilinn þinn fyrir þessa onion-þjónustu @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Lokið onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Settu inn gildan lykil (52 base32 stafir eða 44 base64 stafir) onionServices.authPrompt.failedToSetKey=Tekst ekki að setja upp Tor með lyklinum þínum. +onionServices.authPreferences.header=Auðkenning á onion-þjónustur +onionServices.authPreferences.overview=Sumar onion-þjónustur krefjast þess að þú auðkennir þig með lykli (eins konar lykilorð) áður en þú færð aðgang að þeim. +onionServices.authPreferences.savedKeys=Vistaðir lyklar… +onionServices.authPreferences.dialogTitle=Lyklar fyrir onion-þjónustur +onionServices.authPreferences.dialogIntro=Lyklar fyrir eftirfarandi onion-vefsvæði eru geymdir á tölvunni þinni +onionServices.authPreferences.onionSite=Onion-vefsvæði +onionServices.authPreferences.onionKey=Lykill +onionServices.authPreferences.remove=Fjarlægja +onionServices.authPreferences.removeAll=Fjarlægja allt +onionServices.authPreferences.failedToGetKeys=Tókst ekki að ná í lykla frá Tor +onionServices.authPreferences.failedToRemoveKey=Tókst ekki að fjarlægja lykil diff --git a/chrome/locale/it/torbutton.dtd b/chrome/locale/it/torbutton.dtd index 6bc604e0..c4513582 100644 --- a/chrome/locale/it/torbutton.dtd +++ b/chrome/locale/it/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Apri il prompt di autenticazione del servizio client onion."> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Ricorda questa chiave"> diff --git a/chrome/locale/it/torbutton.properties b/chrome/locale/it/torbutton.properties index 1d4d107b..73c44ccf 100644 --- a/chrome/locale/it/torbutton.properties +++ b/chrome/locale/it/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Connessione cifrata (Servizio onion) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Per saperne di più onionServices.clientAuthMissing=Autorizzazione client mancante per il servizio Tor onion onionServices.authPrompt.description=%S richiede la tua chiave privata. onionServices.authPrompt.keyPlaceholder=Inserisci la tua chiave privata per questo servizio onion @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Fatto onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Per favore inserisci una chiave valida (52 caratteri base32 o 44 caratteri base64) onionServices.authPrompt.failedToSetKey=Impossibile configurare Tor con la tua chiave +onionServices.authPreferences.header=Autenticazione servizi onion +onionServices.authPreferences.overview=Alcuni servizi onion richiedono che ti identifichi con una chiave (una specie di password) prima di potervi accedere. +onionServices.authPreferences.savedKeys=Chiavi salvate… +onionServices.authPreferences.dialogTitle=Chiavi servizio onion +onionServices.authPreferences.dialogIntro=Le chiavi per il seguente sito onion sono salvate nel tuo computer +onionServices.authPreferences.onionSite=Sito onion +onionServices.authPreferences.onionKey=Chiave +onionServices.authPreferences.remove=Rimuovi +onionServices.authPreferences.removeAll=Rimuovi tutte +onionServices.authPreferences.failedToGetKeys=Impossibile recuperare le chiavi da tor +onionServices.authPreferences.failedToRemoveKey=Impossibile rimuovere la chiave diff --git a/chrome/locale/ja/torbutton.dtd b/chrome/locale/ja/torbutton.dtd index 10621b69..b554c344 100644 --- a/chrome/locale/ja/torbutton.dtd +++ b/chrome/locale/ja/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "オニオンサービスのクライアント認証プロンプトを開く"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "このキーを忘れないで、覚えておいてください。"> diff --git a/chrome/locale/ja/torbutton.properties b/chrome/locale/ja/torbutton.properties index 15372225..bb843823 100644 --- a/chrome/locale/ja/torbutton.properties +++ b/chrome/locale/ja/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=接続が暗号化されています (Onion サービ # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=詳細情報 onionServices.clientAuthMissing=Tor オニオンサービスにクライアント認証がありません onionServices.authPrompt.description=%Sは秘密鍵を要求しています。 onionServices.authPrompt.keyPlaceholder=このオニオンサービスのあなたの秘密鍵を入力してください @@ -68,3 +69,14 @@ onionServices.authPrompt.done=完了 onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=有効なキーを入力してください（52 Base32文字または44 Base64文字） onionServices.authPrompt.failedToSetKey=あなたのキーでTorを構成できませんでした +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=鍵 +onionServices.authPreferences.remove=解除 +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key diff --git a/chrome/locale/ka/torbutton.dtd b/chrome/locale/ka/torbutton.dtd index 5d7b84ad..600f057f 100644 --- a/chrome/locale/ka/torbutton.dtd +++ b/chrome/locale/ka/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "გახსენით onion-მომსახურების კლიენტის დამოწმების არე"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "ამ გასაღების დამახსოვრება"> diff --git a/chrome/locale/ka/torbutton.properties b/chrome/locale/ka/torbutton.properties index 62ab9604..4e442fd9 100644 --- a/chrome/locale/ka/torbutton.properties +++ b/chrome/locale/ka/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=კავშირი დაშიფრულია (O # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=იხილეთ ვრცლად onionServices.clientAuthMissing=Tor-ის onion-მომსახურებას აკლია კლიენტის დამოწმება onionServices.authPrompt.description=%S ითხოვს თქვენს საიდუმლო გასაღებს. onionServices.authPrompt.keyPlaceholder=შეიყვანეთ თქვენი საიდუმლო გასაღები ამ onion-მომსახურებისთვის @@ -68,3 +69,14 @@ onionServices.authPrompt.done=მზადაა onionServices.authPrompt.doneAccessKey=დ onionServices.authPrompt.invalidKey=გთხოვთ, შეიყვანეთ მართებული გასაღები (52 base32 სიმბოლო ან 44 base64 სიმბოლო) onionServices.authPrompt.failedToSetKey=ვერ ხერხდება Tor-ის გამართვა თქვენი გასაღებით +onionServices.authPreferences.header=Onion-მომსახურების დამოწმება +onionServices.authPreferences.overview=ზოგიერთი onion-მომსახურება საჭიროებს თქვენი ნამდვილობის დამოწმებას გასაღებით (ერთგვარი პაროლით) მათზე წვდომის მისაღებად. +onionServices.authPreferences.savedKeys=შენახული გასაღებები... +onionServices.authPreferences.dialogTitle=Onion-მომსახურების გასაღებები +onionServices.authPreferences.dialogIntro=გასაღებები მოცემული onion-საიტებისთვის ინახება თქვენს კომპიუტერში +onionServices.authPreferences.onionSite=Onion-საიტი +onionServices.authPreferences.onionKey=გასაღები +onionServices.authPreferences.remove=წაშლა +onionServices.authPreferences.removeAll=ყველას მოცილება +onionServices.authPreferences.failedToGetKeys=ვერ ხერხდება გასაღებების მიღება tor-იდან +onionServices.authPreferences.failedToRemoveKey=ვერ ხერხდება გასაღების მოცილება diff --git a/chrome/locale/ko/torbutton.dtd b/chrome/locale/ko/torbutton.dtd index d4fd6d0d..8df93287 100644 --- a/chrome/locale/ko/torbutton.dtd +++ b/chrome/locale/ko/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Onion 서비스 클라이언트 인증 프롬프트 열기"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> diff --git a/chrome/locale/ko/torbutton.properties b/chrome/locale/ko/torbutton.properties index 1e62aca3..11bbf784 100644 --- a/chrome/locale/ko/torbutton.properties +++ b/chrome/locale/ko/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=연결은 암호화했습니다 (Onion 서비스) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=더 알아보기 onionServices.clientAuthMissing=클라이언트 인증이 없는 Tor onion 서비스 onionServices.authPrompt.description=%S 에서 당신의 개인키를 요구하고 있습니다. onionServices.authPrompt.keyPlaceholder=이 onion 서비스를 사용하기 위해 개인키를 입력하세요. @@ -68,3 +69,14 @@ onionServices.authPrompt.done=완성 onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=유효한 키를 입력해주세요. (base32 의 52개 문자나 base64의 44개 문자) onionServices.authPrompt.failedToSetKey=이 키로는 Tor 설정을 할 수 없습니다. +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=키 +onionServices.authPreferences.remove=제거하기 +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key diff --git a/chrome/locale/lt/torbutton.dtd b/chrome/locale/lt/torbutton.dtd index b4915239..4303936f 100644 --- a/chrome/locale/lt/torbutton.dtd +++ b/chrome/locale/lt/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Atverkite onion paslaugos kliento tapatybės nustatymo užklausą"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Prisiminti šį raktą"> diff --git a/chrome/locale/lt/torbutton.properties b/chrome/locale/lt/torbutton.properties index 2fa5ff16..2146a20e 100644 --- a/chrome/locale/lt/torbutton.properties +++ b/chrome/locale/lt/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Šifruotas ryšys (Onion paslauga) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Sužinoti daugiau onionServices.clientAuthMissing=Tor onion paslaugai trūksta kliento prieigos teisių onionServices.authPrompt.description=%S prašo jūsų asmeninio rakto. onionServices.authPrompt.keyPlaceholder=Įveskite savo privatųjį, šiai onion paslaugai skirtą, raktą @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Atlikta onionServices.authPrompt.doneAccessKey=u onionServices.authPrompt.invalidKey=Įveskite galiojantį raktą (52 base32 arba 44 base64 simbolius) onionServices.authPrompt.failedToSetKey=Nepavyko konfigūruoti Tor naudojant jūsų raktą +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Įrašyti raktai… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=Raktas +onionServices.authPreferences.remove=Šalinti +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Nepavyko pašalinti raktą diff --git a/chrome/locale/mk/torbutton.dtd b/chrome/locale/mk/torbutton.dtd index b9fb0be0..6dea8d58 100644 --- a/chrome/locale/mk/torbutton.dtd +++ b/chrome/locale/mk/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Отвори конзола за автентикација на onion клиентска услуга"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> diff --git a/chrome/locale/mk/torbutton.properties b/chrome/locale/mk/torbutton.properties index d7f28a23..b88e6e22 100644 --- a/chrome/locale/mk/torbutton.properties +++ b/chrome/locale/mk/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Енкриптирано поврзување (Onion У # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Научете повеќе onionServices.clientAuthMissing=На Tor onion услугата и недостасува клиентска автентикација onionServices.authPrompt.description=%S го бара вашиот приватен клуч. onionServices.authPrompt.keyPlaceholder=Внесете го вашиот приватен клуч за оваа onion услуга @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Завршено onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Ве молиме внесете валиден клуч (52 база32карактери или 44 база64 карактери) onionServices.authPrompt.failedToSetKey=Не може да се кофигурира Tor со вашиот клуч +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=Клуч +onionServices.authPreferences.remove=Отстрани +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key diff --git a/chrome/locale/ms/torbutton.dtd b/chrome/locale/ms/torbutton.dtd index 8a63b220..dadcd099 100644 --- a/chrome/locale/ms/torbutton.dtd +++ b/chrome/locale/ms/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Buka bisikan pengesahihan klien perkhidmatan onion"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> diff --git a/chrome/locale/ms/torbutton.properties b/chrome/locale/ms/torbutton.properties index 50b40d37..aa5d9528 100644 --- a/chrome/locale/ms/torbutton.properties +++ b/chrome/locale/ms/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Sambungan Tersulit (Perkhidmatan Onion) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Ketahui lebih lanjut onionServices.clientAuthMissing=Tor onion service missing client authorization onionServices.authPrompt.description=%S is requesting your private key. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Selesai onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=Kunci +onionServices.authPreferences.remove=Buang +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key diff --git a/chrome/locale/nb-NO/torbutton.dtd b/chrome/locale/nb-NO/torbutton.dtd index 6ebda588..bd5e0c42 100644 --- a/chrome/locale/nb-NO/torbutton.dtd +++ b/chrome/locale/nb-NO/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> diff --git a/chrome/locale/nb-NO/torbutton.properties b/chrome/locale/nb-NO/torbutton.properties index 1d3746c3..947b0acf 100644 --- a/chrome/locale/nb-NO/torbutton.properties +++ b/chrome/locale/nb-NO/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Tilkobling kryptert (Løk Tjeneste) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Lær mer onionServices.clientAuthMissing=Tor onion service missing client authorization onionServices.authPrompt.description=%S ber om din private nøkkel. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Ferdig onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) onionServices.authPrompt.failedToSetKey=Kan ikke konfigurere Tor med nøkkelen din +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=Nøkkel +onionServices.authPreferences.remove=Fjern +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key diff --git a/chrome/locale/nl/torbutton.dtd b/chrome/locale/nl/torbutton.dtd index c12f8b6d..4ee769ed 100644 --- a/chrome/locale/nl/torbutton.dtd +++ b/chrome/locale/nl/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Clientauthenticatieprompt voor onion-service openen"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Deze sleutel onthouden"> diff --git a/chrome/locale/nl/torbutton.properties b/chrome/locale/nl/torbutton.properties index 60ca984a..d2b7334a 100644 --- a/chrome/locale/nl/torbutton.properties +++ b/chrome/locale/nl/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Verbinding versleuteld (Onion-service) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Meer info onionServices.clientAuthMissing=Tor-onion-service mist clientautorisatie onionServices.authPrompt.description=%S vraagt om uw privésleutel. onionServices.authPrompt.keyPlaceholder=Voer uw privésleutel voor deze onion-service in @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Gereed onionServices.authPrompt.doneAccessKey=G onionServices.authPrompt.invalidKey=Voer een geldige sleutel in (52 base32-tekens of 44 base64-tekens) onionServices.authPrompt.failedToSetKey=Kan Tor niet configureren met uw sleutel +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Opgeslagen sleutels… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=Sleutel +onionServices.authPreferences.remove=Verwijderen +onionServices.authPreferences.removeAll=Alle verwijderen +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key diff --git a/chrome/locale/pl/torbutton.dtd b/chrome/locale/pl/torbutton.dtd index d9bc8539..9ca52bb4 100644 --- a/chrome/locale/pl/torbutton.dtd +++ b/chrome/locale/pl/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> diff --git a/chrome/locale/pl/torbutton.properties b/chrome/locale/pl/torbutton.properties index fddf7a15..f60d9c20 100644 --- a/chrome/locale/pl/torbutton.properties +++ b/chrome/locale/pl/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Połączenie zaszyfrowane (usługa Onion) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Dowiedz się więcej onionServices.clientAuthMissing=Tor onion service missing client authorization onionServices.authPrompt.description=%S is requesting your private key. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Skończone onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=Klucz +onionServices.authPreferences.remove=Usuń +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key diff --git a/chrome/locale/pt-BR/torbutton.dtd b/chrome/locale/pt-BR/torbutton.dtd index 626f4870..83e26740 100644 --- a/chrome/locale/pt-BR/torbutton.dtd +++ b/chrome/locale/pt-BR/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Prompt de autenticação do cliente do serviço onion aberto"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Lembre-se desta chave"> diff --git a/chrome/locale/pt-BR/torbutton.properties b/chrome/locale/pt-BR/torbutton.properties index e3ab7fc3..c972b629 100644 --- a/chrome/locale/pt-BR/torbutton.properties +++ b/chrome/locale/pt-BR/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Conexão criptografada (Serviço Onion) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Saber mais onionServices.clientAuthMissing=O serviço onion do Tor não tem autorização de cliente onionServices.authPrompt.description=%S está solicitado a sua chave privada. onionServices.authPrompt.keyPlaceholder=Insira a sua chave privada para usar este serviço onion @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Pronto onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Por favor, insira uma chave válida (32 caracteres_Base52 ou 64 caracteres_Base44) onionServices.authPrompt.failedToSetKey=Não foi possível configurar Tor com a sua chave +onionServices.authPreferences.header=Autenticação de Serviços de Onion +onionServices.authPreferences.overview=Alguns serviços de onion exigem que você se identifique com uma chave (um tipo de senha) antes de poder acessá-los. +onionServices.authPreferences.savedKeys=Chaves salvas… +onionServices.authPreferences.dialogTitle=Chaves de serviço de onion +onionServices.authPreferences.dialogIntro=As chaves para os seguintes sites são armazenadas no seu computador +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=Chave +onionServices.authPreferences.remove=Remover +onionServices.authPreferences.removeAll=Remover tudo +onionServices.authPreferences.failedToGetKeys=Não foi possível recuperar as chaves do tor +onionServices.authPreferences.failedToRemoveKey=Não foi possível remover a chave diff --git a/chrome/locale/ro/torbutton.dtd b/chrome/locale/ro/torbutton.dtd index 9bbb81bb..394c0468 100644 --- a/chrome/locale/ro/torbutton.dtd +++ b/chrome/locale/ro/torbutton.dtd @@ -51,3 +51,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Deschideți promptul de autentificare a clientului de serviciu onion"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> diff --git a/chrome/locale/ro/torbutton.properties b/chrome/locale/ro/torbutton.properties index 77da0e24..9a04ad6c 100644 --- a/chrome/locale/ro/torbutton.properties +++ b/chrome/locale/ro/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Conexiune Criptată (Serviciu Onion) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Află mai mult onionServices.clientAuthMissing=Serviciul onion Tor nu are autorizația clientului onionServices.authPrompt.description=%S solicită cheia dvs. privată. onionServices.authPrompt.keyPlaceholder=Introduceți cheia privată pentru acest serviciu de ceapă @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Gata onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Vă rugăm să introduceți o cheie validă (52 de caractere base32 sau 44 de caractere base64) onionServices.authPrompt.failedToSetKey=Imposibil de configurat Tor cu cheia dvs. +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=Cheie +onionServices.authPreferences.remove=Eliminare +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key diff --git a/chrome/locale/ru/torbutton.dtd b/chrome/locale/ru/torbutton.dtd index 6ab6b91e..3dcb86bf 100644 --- a/chrome/locale/ru/torbutton.dtd +++ b/chrome/locale/ru/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> diff --git a/chrome/locale/ru/torbutton.properties b/chrome/locale/ru/torbutton.properties index a1da2002..92838e87 100644 --- a/chrome/locale/ru/torbutton.properties +++ b/chrome/locale/ru/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Соединение зашифровано (Onion Serv # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Узнать больше onionServices.clientAuthMissing=Tor onion service missing client authorization onionServices.authPrompt.description=%S запрашивает ваш закрытый ключ. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Готово onionServices.authPrompt.doneAccessKey=Д onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) onionServices.authPrompt.failedToSetKey=Не удается настроить Tor с вашим ключом +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=Ключ +onionServices.authPreferences.remove=Удалить +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key diff --git a/chrome/locale/sv-SE/torbutton.dtd b/chrome/locale/sv-SE/torbutton.dtd index ff8b813f..d4e964d4 100644 --- a/chrome/locale/sv-SE/torbutton.dtd +++ b/chrome/locale/sv-SE/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Öppna onion-tjänstklientens autentiseringsangivning"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Kom ihåg den här nyckeln"> diff --git a/chrome/locale/sv-SE/torbutton.properties b/chrome/locale/sv-SE/torbutton.properties index 5c99b09e..6062fc61 100644 --- a/chrome/locale/sv-SE/torbutton.properties +++ b/chrome/locale/sv-SE/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Anslutning krypterad (Onion-tjänst) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Läs mer onionServices.clientAuthMissing=Tor onion-tjänst saknar klientautentisering onionServices.authPrompt.description=%S begär din privata nyckel. onionServices.authPrompt.keyPlaceholder=Ange din privata nyckel för den här onion-tjänsten @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Färdig onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Ange en giltig nyckel (52 base32-tecken eller 44 base64-tecken) onionServices.authPrompt.failedToSetKey=Det går inte att konfigurera Tor med din nyckel +onionServices.authPreferences.header=Autentisering för onion-tjänster +onionServices.authPreferences.overview=Vissa onion-tjänster kräver att du identifierar dig med en nyckel (ett slags lösenord) innan du kan komma åt dem. +onionServices.authPreferences.savedKeys=Sparade nycklar… +onionServices.authPreferences.dialogTitle=Nycklar för onion-tjänster +onionServices.authPreferences.dialogIntro=Nycklar för följande onion-sidor lagras på din dator +onionServices.authPreferences.onionSite=Onion-sida +onionServices.authPreferences.onionKey=Förklaring +onionServices.authPreferences.remove=Ta bort +onionServices.authPreferences.removeAll=Ta bort alla +onionServices.authPreferences.failedToGetKeys=Det går inte att hämta nycklar från Tor +onionServices.authPreferences.failedToRemoveKey=Det går inte att ta bort nyckeln diff --git a/chrome/locale/th/torbutton.dtd b/chrome/locale/th/torbutton.dtd index 1e16c404..88593dce 100644 --- a/chrome/locale/th/torbutton.dtd +++ b/chrome/locale/th/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> diff --git a/chrome/locale/th/torbutton.properties b/chrome/locale/th/torbutton.properties index 44d26298..2a2d8114 100644 --- a/chrome/locale/th/torbutton.properties +++ b/chrome/locale/th/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=การเชื่อมต่อเข้ารห # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=เรียนรู้เพิ่มเติม onionServices.clientAuthMissing=Tor onion service missing client authorization onionServices.authPrompt.description=%S is requesting your private key. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service @@ -68,3 +69,14 @@ onionServices.authPrompt.done=เสร็จสิ้น onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=รหัสกุญแจ +onionServices.authPreferences.remove=ลบออก +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key diff --git a/chrome/locale/tr/torbutton.dtd b/chrome/locale/tr/torbutton.dtd index b9ae1b56..481b0dca 100644 --- a/chrome/locale/tr/torbutton.dtd +++ b/chrome/locale/tr/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Onion hizmeti istemi kimlik doğrulama penceresini aç"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Bu anahtar anımsansın"> diff --git a/chrome/locale/tr/torbutton.properties b/chrome/locale/tr/torbutton.properties index 3ca2519d..aaa4b3aa 100644 --- a/chrome/locale/tr/torbutton.properties +++ b/chrome/locale/tr/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Bağlantı Şifreli (Onion Hizmeti) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Ayrıntılı bilgi alın onionServices.clientAuthMissing=Tor Onion hizmeti istemci kimlik doğrulaması eksik onionServices.authPrompt.description=%S kişisel anahtarınıza gerek duyuyor onionServices.authPrompt.keyPlaceholder=Bu Onion hizmeti için kişisel anahtarınızı yazın @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Tamam onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Lütfen geçerli bir anahtar yazın (52 base32 karakteri ya da 44 base64 karakteri) onionServices.authPrompt.failedToSetKey=Tor, anahtarınız ile yapılandırılamadı +onionServices.authPreferences.header=Onion Hizmetleri Kimlik Doğrulaması +onionServices.authPreferences.overview=Bazı onion hizmetleri ne erişmek için bir anahtar (bir tür parola) kullanarak kimliğinizi belirtmeniz gerekir. +onionServices.authPreferences.savedKeys=Kaydedilmiş Anahtarlar… +onionServices.authPreferences.dialogTitle=Onion Hizmeti Anahtarları +onionServices.authPreferences.dialogIntro=Bilgisayarınıza şu onion siteleri için kayıtlı anahtarlar var +onionServices.authPreferences.onionSite=Onion Sitesi +onionServices.authPreferences.onionKey=Anahtar +onionServices.authPreferences.remove=Sil +onionServices.authPreferences.removeAll=Tümünü Sil +onionServices.authPreferences.failedToGetKeys=Anahtarlar Tor üzerinden alınamadı +onionServices.authPreferences.failedToRemoveKey=Anahtar silinemedi diff --git a/chrome/locale/vi/torbutton.dtd b/chrome/locale/vi/torbutton.dtd index 5d8ea4bc..929319b4 100644 --- a/chrome/locale/vi/torbutton.dtd +++ b/chrome/locale/vi/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> diff --git a/chrome/locale/vi/torbutton.properties b/chrome/locale/vi/torbutton.properties index 344b77d7..fc08d6a4 100644 --- a/chrome/locale/vi/torbutton.properties +++ b/chrome/locale/vi/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Đã mã hóa kết nối (Onion Service) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Biết thêm onionServices.clientAuthMissing=Tor onion service missing client authorization onionServices.authPrompt.description=%S is requesting your private key. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Hoàn tất onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=Khóa dữ liệu +onionServices.authPreferences.remove=Gỡ bỏ +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key diff --git a/chrome/locale/zh-CN/torbutton.dtd b/chrome/locale/zh-CN/torbutton.dtd index ad349c64..eae74093 100644 --- a/chrome/locale/zh-CN/torbutton.dtd +++ b/chrome/locale/zh-CN/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "打开洋葱服务客户端认证提示"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> diff --git a/chrome/locale/zh-CN/torbutton.properties b/chrome/locale/zh-CN/torbutton.properties index 72b5b373..1c9bbd13 100644 --- a/chrome/locale/zh-CN/torbutton.properties +++ b/chrome/locale/zh-CN/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=连接已经被加密（洋葱服务） # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=更多详情 onionServices.clientAuthMissing=Tor 洋葱服务客户端认证失败 onionServices.authPrompt.description=%S 需要您的私钥 onionServices.authPrompt.keyPlaceholder=输入您的私钥来使用此洋葱服务 @@ -68,3 +69,14 @@ onionServices.authPrompt.done=完成 onionServices.authPrompt.doneAccessKey=天 onionServices.authPrompt.invalidKey=请输入一个合法的密钥（52位 base32 字符或44位 base64 字符） onionServices.authPrompt.failedToSetKey=无法使用您的密钥来配置 Tor +onionServices.authPreferences.header=洋葱服务认证 +onionServices.authPreferences.overview=某些洋葱服务需要您在使用前用密钥（一种密码）进行身份认证。 +onionServices.authPreferences.savedKeys=已保存密钥... +onionServices.authPreferences.dialogTitle=洋葱服务密钥 +onionServices.authPreferences.dialogIntro=接下来的洋葱网站的密钥储存在您的电脑上 +onionServices.authPreferences.onionSite=洋葱站 +onionServices.authPreferences.onionKey=线图 +onionServices.authPreferences.remove=移除 +onionServices.authPreferences.removeAll=移除全部 +onionServices.authPreferences.failedToGetKeys=无法从Tor索回密钥 +onionServices.authPreferences.failedToRemoveKey=无法移除密钥 diff --git a/chrome/locale/zh-TW/torbutton.dtd b/chrome/locale/zh-TW/torbutton.dtd index 1ffff33d..2f765422 100644 --- a/chrome/locale/zh-TW/torbutton.dtd +++ b/chrome/locale/zh-TW/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "開啟 Onion 服務用戶端驗證提示"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> diff --git a/chrome/locale/zh-TW/torbutton.properties b/chrome/locale/zh-TW/torbutton.properties index dbef4780..f8c1ce50 100644 --- a/chrome/locale/zh-TW/torbutton.properties +++ b/chrome/locale/zh-TW/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=連接加密（洋蔥服務） # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=了解更多 onionServices.clientAuthMissing=Tor onion 服務缺少用戶端授權 onionServices.authPrompt.description=%S 正請求您的私鑰。 onionServices.authPrompt.keyPlaceholder=請輸入私鑰以使用此 onion 服務 @@ -68,3 +69,14 @@ onionServices.authPrompt.done=完成 onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=請輸入有效金鑰（52 個 Base32 字元，或 44 個 Base64 字元） onionServices.authPrompt.failedToSetKey=無法使用您的金鑰設定 Tor +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=金鑰 +onionServices.authPreferences.remove=移除 +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key

1 0

[tor-browser/tor-browser-68.5.0esr-9.5-1] fixup! Bug 23247: Communicating security expectations for .onion
by boklm＠torproject.org 03 Mar '20

03 Mar '20

commit 03101bba2cf4a694deec0b7b040d8141f8c7cf20 Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Feb 12 16:41:26 2020 -0600 fixup! Bug 23247: Communicating security expectations for .onion --- browser/base/content/browser-siteIdentity.js | 14 ++++++-------- .../shared/identity-block/identity-block.inc.css | 18 +++++++++--------- .../themes/shared/identity-block/onion-disabled.svg | 9 --------- browser/themes/shared/identity-block/onion-lock.svg | 9 --------- browser/themes/shared/identity-block/onion-slash.svg | 5 +++++ browser/themes/shared/identity-block/onion-warning.svg | 6 ++++++ browser/themes/shared/identity-block/onion.svg | 9 ++------- browser/themes/shared/jar.inc.mn | 4 ++-- 8 files changed, 30 insertions(+), 44 deletions(-) diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js index 9da2e289b86d..32e939787fb7 100644 --- a/browser/base/content/browser-siteIdentity.js +++ b/browser/base/content/browser-siteIdentity.js @@ -682,12 +682,8 @@ var gIdentityHandler = { ); // _isSecure implicitly includes onion services, which may not have an SSL certificate } else if (this._uriHasHost && this._isSecure && this._secInfo != null) { - let uriIsOnionHost = this._uriIsOnionHost; - if (uriIsOnionHost) { - this._identityBox.className = this._secInfo.serverCert.isSelfSigned ? "onionSelfSigned" : "onionVerifiedDomain"; - } else { - this._identityBox.className = "verifiedDomain"; - } + const uriIsOnionHost = this._uriIsOnionHost; + this._identityBox.className = uriIsOnionHost ? "onionVerifiedDomain" : "verifiedDomain"; if (this._isMixedActiveContentBlocked) { this._identityBox.classList.add(uriIsOnionHost ? "onionMixedActiveBlocked" : "mixedActiveBlocked"); } @@ -708,7 +704,7 @@ var gIdentityHandler = { // For net errors we should not show notSecure as it's likely confusing this._identityBox.className = "unknownIdentity"; } else { - let uriIsOnionHost = this._uriIsOnionHost; + const uriIsOnionHost = this._uriIsOnionHost; if (this._isBroken) { this._identityBox.className = uriIsOnionHost ? "onionUnknownIdentity" : "unknownIdentity"; @@ -719,6 +715,7 @@ var gIdentityHandler = { } else if (this._isMixedPassiveContentLoaded) { this._identityBox.classList.add(uriIsOnionHost ? "onionMixedDisplayContent" : "mixedDisplayContent"); } else { + // TODO: ignore weak https cipher for onionsites? this._identityBox.classList.add("weakCipher"); } } else { @@ -749,7 +746,8 @@ var gIdentityHandler = { } if (this._isCertUserOverridden) { - this._identityBox.classList.add("certUserOverridden"); + const uriIsOnionHost = this._uriIsOnionHost; + this._identityBox.classList.add(uriIsOnionHost ? "onionCertUserOverridden" : "certUserOverridden"); // Cert is trusted because of a security exception, verifier is a special string. tooltip = gNavigatorBundle.getString( "identity.identified.verified_by_you" diff --git a/browser/themes/shared/identity-block/identity-block.inc.css b/browser/themes/shared/identity-block/identity-block.inc.css index e1911fd47305..b96f10d3754b 100644 --- a/browser/themes/shared/identity-block/identity-block.inc.css +++ b/browser/themes/shared/identity-block/identity-block.inc.css @@ -300,22 +300,22 @@ toolbar[brighttext] #urlbar[pageproxystate="valid"] > #identity-box.chromeUI > # } #urlbar[pageproxystate="valid"] > #identity-box.onionUnknownIdentity > #connection-icon, -#urlbar[pageproxystate="valid"] > #identity-box.onionSelfSigned > #connection-icon { - list-style-image: url(chrome://browser/skin/onion.svg); - visibility: visible; -} - #urlbar[pageproxystate="valid"] > #identity-box.onionVerifiedDomain > #connection-icon, #urlbar[pageproxystate="valid"] > #identity-box.onionVerifiedIdentity > #connection-icon, #urlbar[pageproxystate="valid"] > #identity-box.onionMixedActiveBlocked > #connection-icon { - list-style-image: url(chrome://browser/skin/onion-lock.svg); + list-style-image: url(chrome://browser/skin/onion.svg); visibility: visible; } -#urlbar[pageproxystate="valid"] > #identity-box.onionMixedActiveContent > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.onionMixedDisplayContent > #connection-icon, #urlbar[pageproxystate="valid"] > #identity-box.onionMixedDisplayContentLoadedActiveBlocked > #connection-icon, -#urlbar[pageproxystate="valid"] > #identity-box.onionMixedDisplayContent > #connection-icon { - list-style-image: url(chrome://browser/skin/onion-disabled.svg); +#urlbar[pageproxystate="valid"] > #identity-box.onionCertUserOverridden > #connection-icon { + list-style-image: url(chrome://browser/skin/onion-warning.svg); + visibility: visible; +} + +#urlbar[pageproxystate="valid"] > #identity-box.onionMixedActiveContent > #connection-icon { + list-style-image: url(chrome://browser/skin/onion-slash.svg); visibility: visible; } diff --git a/browser/themes/shared/identity-block/onion-disabled.svg b/browser/themes/shared/identity-block/onion-disabled.svg deleted file mode 100644 index f5b20a87a923..000000000000 --- a/browser/themes/shared/identity-block/onion-disabled.svg +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> - <title>onion-disabled</title> - <defs></defs> - <g id="onion-disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> - <path d="M3.55670557,13.5290809 C2.58943965,12.7067569 2,11.5773827 2,10.2383803 C2,8.40140797 3.11044937,6.84614642 4.80245393,5.95790561 C4.86922061,5.92314081 4.937062,5.88953483 5.00557508,5.85697179 C5.34048317,5.68140952 5.95495153,5.31464081 6.18735866,4.8796172 C6.261514,4.74090562 6.26057363,4.55305979 6.20885297,4.4070476 C6.11172559,4.13310092 5.57517408,3.53792744 5.57517408,3.53792744 L6.39988357,3 L7.47070238,3.38224206 C7.23186151,2.5028722 6.97233174,1.62308364 8.87366696,4.4408921e-16 L8.87366696,0.000113687544 C8.14572562,0.965320936 8.77600936,1.33867083 8.69392696,2.02329722 C9.36752565,0.933374736 10.7903253,0.789787368 11.8884333,0.334923505 C10.6431583,1.59850841 9.72300609,3.05795044 8.87524898,3.88361241 L9.6358507,4.15511863 C9.6358507,4.15511863 9.27501511,4.42489353 9.52743882,4.95911272 C9.65035936,5.21926936 9.85710767,5.38741514 10.0560643,5.49588134 C10.2394376,5.55069385 10.4187806,5.61269109 10.5936905,5.68164129 C10.7858529,5.7574053 10.972 3418,5.84145128 11.1524919,5.93329454 L3.55670557,13.5290809 Z M5.3590214,14.5551922 L12.7674177,7.1467959 C13.5406039,7.99044704 14,9.05632625 14,10.2383803 C14,13.0968586 11.3137496,15 8,15 C7.05229776,15 6.15591919,14.8443406 5.3590214,14.5551922 Z" id="Combined-Shape" fill="#4A4A4A" fill-rule="nonzero"></path> - <path d="M13.7928932,1.29289322 C14.1834175,0.902368927 14.8165825,0.902368927 15.2071068,1.29289322 C15.5976311,1.68341751 15.5976311,2.31658249 15.2071068,2.70710678 L2.70710678,15.2071068 C2.31658249,15.5976311 1.68341751,15.5976311 1.29289322,15.2071068 C0.902368927,14.8165825 0.902368927,14.1834175 1.29289322,13.7928932 L13.7928932,1.29289322 Z" id="Line-2" fill="#D92D21" fill-rule="nonzero"></path> - </g> -</svg> diff --git a/browser/themes/shared/identity-block/onion-lock.svg b/browser/themes/shared/identity-block/onion-lock.svg deleted file mode 100644 index c88247eb19d7..000000000000 --- a/browser/themes/shared/identity-block/onion-lock.svg +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> - <title>onion+lock</title> - <defs></defs> - <g id="onion+lock" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> - <path d="M6.12228848,14.9544711 C3.22461281,14.6498012 1,12.8396709 1,10.2383803 C1,8.40140797 2.11044937,6.84614642 3.80245393,5.95790561 C3.86922061,5.92314081 3.937062,5.88953483 4.00557508,5.85697179 C4.34048317,5.68140952 4.95495153,5.31464081 5.18735866,4.8796172 C5.261514,4.74090562 5.26057363,4.55305979 5.20885297,4.4070476 C5.11172559,4.13310092 4.57517408,3.53792744 4.57517408,3.53792744 L5.39988357,3 L6.47070238,3.38224206 C6.23186151,2.5028722 5.97233174,1.62308364 7.87366696,0 L7.87366696,0.000113687544 C7.14572562,0.965320936 7.77600936,1.33867083 7.69392696,2.02329722 C8.36752565,0.933374736 9.79032527,0.789787368 10.8884333,0.334923505 C9.64315826,1.59850841 8.72300609,3.05795044 7.87524898,3.88361241 L8.6358507,4.15511863 C8.6358507,4.15511863 8.27501511,4.42489353 8.52743882,4.95911272 C8.56957789,5.04829846 8.6215686,5.12667085 8.67971976,5.19553247 C7.54569301,5.94640706 6.80000003,7.23368269 6.80000003,8.70000013 L6.80000003,8.80234816 C6.31732959,9.1249 1448 6,9.67479474 6,10.3000002 L6,14.3000003 C6,14.530995 6.04331804,14.7517071 6.12228848,14.9544711 Z" id="Combined-Shape" fill="#589A0F" fill-rule="nonzero"></path> - <path d="M11.0000002,5.5 C9.22720009,5.5 7.80000003,6.92720006 7.80000003,8.70000013 L7.80000003,9.50000016 C7.35680001,9.50000016 7,9.85680017 7,10.3000002 L7,14.3000003 C7,14.7432004 7.35680001,15.1000004 7.80000003,15.1000004 L14.2000003,15.1000004 C14.6432003,15.1000004 15.0000003,14.7432004 15.0000003,14.3000003 L15.0000003,10.3000002 C15.0000003,9.85680017 14.6432003,9.50000016 14.2000003,9.50000016 L14.2000003,8.70000013 C14.2000003,6.92720006 12.7728002,5.5 11.0000002,5.5 Z M11.0000002,7.10000006 C11.8864002,7.10000006 12.6000002,7.81360009 12.6000002,8.70000013 L12.6000002,9.50000016 L9.4000001,9.50000016 L9.4000001,8.70000013 C9.4000001,7.81360009 10.1136001,7.10000006 11.0000002,7.10000006 Z" id="Shape" fill="#589A0F" fill-rule="nonzero"></path> - </g> -</svg> diff --git a/browser/themes/shared/identity-block/onion-slash.svg b/browser/themes/shared/identity-block/onion-slash.svg new file mode 100644 index 000000000000..e7c98b769482 --- /dev/null +++ b/browser/themes/shared/identity-block/onion-slash.svg @@ -0,0 +1,5 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"> + <path d="M3.409559 13.112147C3.409559 13.112147 8.200807 8.103115 8.200807 8.103115C8.200807 8.103115 8.200807 6.516403 8.200807 6.516403C8.620819 6.516403 9.009719 6.703075 9.274171 6.998639C9.274171 6.998639 10.160863 6.080835 10.160863 6.080835C9.663071 5.567487 8.978607 5.256367 8.200807 5.256367C8.200807 5.256367 8.200807 4.400787 8.200807 4.400787C9.196391 4.400787 10.098639 4.805243 10.736435 5.458595C10.736435 5.458595 11.623127 4.540791 11.623127 4.540791C10.751991 3.669655 9.538623 3.125195 8.200807 3.125195C8.200807 3.125195 8.200807 2.269615 8.200807 2.269615C9.756407 2.269615 11.172003 2.907411 12.214255 3.918551C12.214255 3.918551 13.100947 3.000747 13.100947 3.000747C11.825355 1.756267 10.098639 0.994023 8.185251 0.994023C4.311807 0.994023 1.185051 4.120779 1.185051 7.994223C1.185051 10.016503 2.040631 11.836555 3.409559 13.112147C3.409559 13.112147 3.409559 13.112147 3.409559 13.112147" fill-opacity="context-fill-opacity" fill="context-fill" /> + <path d="M14.205423 4.416343C14.205423 4.416343 13.287619 5.380815 13.287619 5.380815C13.692075 6.158615 13.909859 7.045307 13.909859 7.994223C13.909859 11.152091 11.358675 13.718831 8.200807 13.718831C8.200807 13.718831 8.200807 12.863251 8.200807 12.863251C10.891995 12.863251 13.069835 10.669855 13.069835 7.978667C13.069835 7.278647 12.929831 6.625295 12.665379 6.018611C12.665379 6.018611 11.685351 7.045307 11.685351 7.045307C11.763131 7.340871 11.809799 7.651991 11.809799 7.963111C11.809799 9.954279 10.207531 11.556547 8.216363 11.572103C8.216363 11.572103 8.216363 10.716523 8.216363 10.716523C9.725295 10.700967 10.954219 9.472043 10.954219 7.963111C10.954219 7.916443 10.954219 7.854219 10.954219 7.807551C10.954219 7.807551 4.887379 14.169955 4.887379 14.169955C5.867407 14.698859 6.987439 14.994423 8.185251 14.994423C12.058695 14.994423 15.185451 11.867667 15.185451 7.994223C15.185451 6.687519 14.827663 5.474151 14.205423 4.416343C14.205423 4.416343 14.205423 4.416343 14.205423 4.416343" fill-opacity="context-fill-opacity" fill="context-fill" /> + <path d="M1.791735 15.461103C1.402835 15.461103 1.045047 15.212207 0.889487 14.838863C0.733927 14.465519 0.827267 14.014395 1.107271 13.734387C1.107271 13.734387 13.458735 0.822907 13.458735 0.822907C13.847635 0.434007 14.454319 0.449563 14.827663 0.838467C15.201007 1.227367 15.216563 1.865163 14.843223 2.269619C14.843223 2.269619 2.491759 15.181099 2.491759 15.181099C2.289531 15.352215 2.040635 15.461107 1.791739 15.461107C1.791739 15.461107 1.791735 15.461103 1.791735 15.461103" fill="#ff0039" /> +</svg> diff --git a/browser/themes/shared/identity-block/onion-warning.svg b/browser/themes/shared/identity-block/onion-warning.svg new file mode 100644 index 000000000000..d42a7dab7246 --- /dev/null +++ b/browser/themes/shared/identity-block/onion-warning.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"> + <path d="M15.8630401732 14.127C15.8630401732 14.127 12.6649598146 7.716 12.6649598146 7.716C12.4469357756 7.279935 12.0003277145 7.0043454 11.5116853046 7.0043454C11.0230428947 7.0043454 10.5764348336 7.279935 10.3584107946 7.716C10.3584107946 7.716 7.1573218938 14.127 7.1573218938 14.127C6.95646770542 14.527294 6.97733695982 15.002669 7.21250176686 15.38393C7.4476665739 15.765191 7.86372750208 15.998191 8.3126020986 16.0C8.3126020986 16.0 14.7077599684 16.0 14.7077599684 16.0C15.1566344646 15.9982 15.572695794 15.765191 15.8078605007 15.38393C16.0430252075 15.002669 16.0638944619 14.527294 15.8630371647 14.127C15.8630371647 14.127 15.8630401732 14.127 15.8630401732 14.127" fill="#ffbf00" /> + <path d="M11.5106824572 8.0C11.6210488221 7.99691 11.7223975832 8.060469 11.7674113916 8.161C11.7674113916 8.161 14.9644889028 14.573 14.9644889028 14.573C15.0126456349 14.66534 15.0076715118 14.776305 14.9514518866 14.864C14.9011992034 14.95041 14.8079143382 15.002854 14.7077599684 15.001048C14.7077599684 15.001048 8.3126020986 15.001048 8.3126020986 15.001048C8.2124480296 15.002854 8.1191607576 14.950409 8.0689101804 14.864C8.0124814615 14.77637 8.0075053327 14.665298 8.0558731642 14.573C8.0558731642 14.573 11.2529506754 8.161 11.2529506754 8.161C11.2981038796 8.0601247 11.3999560701 7.9964997 11.5106824572 8.0M11.5106824572 6.9999751C11.0194557096 6.9969427 10.5701148893 7.2754275 10.3554022524 7.716C10.3554022524 7.716 7.1573218938 14.127 7.1573218938 14.127C6.95646770542 14.527294 6.97733695982 15.002669 7.21250176686 15.38393C7.4476665739 15.765191 7.86372750208 15.998191 8.3126020986 16.0C8.3126020986 16.0 14.7077599684 16.0 14.7077599684 16.0C15.1566344646 15.9982 15.57269 5794 15.765191 15.8078605007 15.38393C16.0430252075 15.002669 16.0638944619 14.527294 15.8630371647 14.127C15.8630371647 14.127 12.6649598146 7.716 12.6649598146 7.716C12.4504036219 7.2757546 12.0015481798 6.9973287 11.5106824572 6.9999751C11.5106824572 6.9999751 11.5106824572 6.9999751 11.5106824572 6.9999751" opacity="0.35" fill="#d76e00" /> + <path d="M11.5327451 12.0C11.8096733867 12.0 12.0341688 11.776142 12.0341688 11.5C12.0341688 11.5 12.0341688 9.5 12.0341688 9.5C12.0341688 9.2238576 11.8096733867 9.0 11.5327451 9.0C11.2558168133 9.0 11.0313214 9.2238576 11.0313214 9.5C11.0313214 9.5 11.0313214 11.5 11.0313214 11.5C11.0313214 11.776142 11.2558168133 12.0 11.5327451 12.0C11.5327451 12.0 11.5327451 12.0 11.5327451 12.0M11.5327451 12.809C11.1500294496 12.809 10.8397775466 13.118371 10.8397775466 13.5C10.8397775466 13.881629 11.1500294496 14.191 11.5327451 14.191C11.9154607504 14.191 12.2257126534 13.881629 12.2257126534 13.5C12.2257126534 13.118371 11.9154607504 12.809 11.5327451 12.809C11.5327451 12.809 11.5327451 12.809 11.5327451 12.809" fill="#ffffff" /> + <path d="M7.08030321348 6.552C7.90163523408 6.56 8.5645173655 7.225 8.5645173655 8.046C8.5645173655 8.866 7.90163523408 9.532 7.08030321348 9.54C7.08030321348 9.54 7.08030321348 6.552 7.08030321348 6.552M6.30610502068 13.756C6.30610502068 13.756 9.4991711423 7.353 9.4991711423 7.353C9.5453021227 7.259 9.6144985933 7.184 9.6716608951 7.098C9.2845617987 6.039 8.2756973143 5.277 7.08030321348 5.271C7.08030321348 5.271 7.08030321348 4.417 7.08030321348 4.417C8.5043465215 4.423 9.7238089599 5.251 10.3164917733 6.443C10.6795225321 6.21 11.1067355245 6.074 11.5519997701 6.074C11.5519997701 6.074 11.5620282441 6.074 11.5620282441 6.074C11.5620282441 6.074 11.5640339389 6.074 11.5640339389 6.074C11.5660396337 6.074 11.5690481759 6.075 11.5710538707 6.075C10.8108955415 4.35 9.0900094031 3.141 7.08030321348 3.135C7.08030321348 3.135 7.08030321348 2.281 7.08030321348 2.281C9.6716608951 2.288 11.8618796167 3.993 12.5889439817 6.34C13.0231769059 6.561 13.3922247491 6.9 13.6088397875 7.344C13.60 88397875 7.344 14.1162805719 8.361 14.1162805719 8.361C14.1202919615 8.256 14.1313232829 8.152 14.1313232829 8.046C14.1313232829 4.155 10.9683425833 1.0 7.06626334988 1.0C3.16318126908 1.0 0.00020056948 4.155 0.00020056948 8.046C0.00020056948 11.603 2.64571201068 14.536 6.08046435568 15.015C6.03633907008 14.595 6.10252699848 14.16 6.30610502068 13.756C6.30610502068 13.756 6.30610502068 13.756 6.30610502068 13.756" fill-opacity="context-fill-opacity" fill="context-fill" /> +</svg> diff --git a/browser/themes/shared/identity-block/onion.svg b/browser/themes/shared/identity-block/onion.svg index e102f41c5991..b123a9786acc 100644 --- a/browser/themes/shared/identity-block/onion.svg +++ b/browser/themes/shared/identity-block/onion.svg @@ -1,8 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> - <title>onion</title> - <defs></defs> - <g id="onion" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> - <path d="M7.47070238,3.38224206 C7.23186151,2.5028722 6.97233174,1.62308364 8.87366696,4.4408921e-16 L8.87366696,0.000113687544 C8.14572562,0.965320936 8.77600936,1.33867083 8.69392696,2.02329722 C9.36752565,0.933374736 10.7903253,0.789787368 11.8884333,0.334923505 C10.6431583,1.59850841 9.72300609,3.05795044 8.87524898,3.88361241 L9.6358507,4.15511863 C9.6358507,4.15511863 9.27501511,4.42489353 9.52743882,4.95911272 C9.65035936,5.21926936 9.85710767,5.38741514 10.0560643,5.49588134 C10.2394376,5.55069385 10.4187806,5.61269109 10.5936905,5.68164129 C12.6087813,6.47613299 14,8.18134675 14,10.2383803 C14,13.0968586 11.3137496,15 8,15 C4.68625036,15 2,13.0968586 2,10.2383803 C2,8.40140797 3.11044937,6.84614642 4.80245393,5.95790561 C4.86922061,5.92314081 4.937062,5.88953483 5.00557508,5.85697179 C5.34048317,5.68140952 5.95495153,5.31464081 6.18735866,4.8796172 C6.261514,4.74090562 6.26057363,4.55305979 6.20885297,4.4070476 C6.11172559,4.13310092 5.57517408,3.53792744 5.57517408 ,3.53792744 L6.39988357,3 L7.47070238,3.38224206 Z" id="Combined-Shape" fill="#589A0F" fill-rule="nonzero"></path> - </g> +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"> + <path d="M8.01435945 13.726867125C8.01435945 13.726867125 8.01435945 12.87830525 8.01435945 12.87830525C10.70227825 12.87051775 12.87869375 10.689666 12.87869375 7.9998060125C12.87869375 5.310140275 10.70227825 3.1292621 8.01435945 3.121500325C8.01435945 3.121500325 8.01435945 2.272938975 8.01435945 2.272938975C11.170899375 2.280892725 13.727061375 4.8415202875 13.727061375 7.9998060125C13.727061375 11.158285375 11.170899375 13.719105 8.01435945 13.726867125C8.01435945 13.726867125 8.01435945 13.726867125 8.01435945 13.726867125M8.01435945 10.756805625C9.5304373 10.74884925 10.75758175 9.5180185125 10.75758175 7.9998060125C10.75758175 6.4817875 9.5304373 5.2509564125 8.01435945 5.2430005625C8.01435945 5.2430005625 8.01435945 4.3946332875 8.01435945 4.3946332875C9.999251625 4.4023945375 11.60614275 6.013167425 11.60614275 7.9998060125C11.60614275 9.986639375 9.999251625 11.597411125 8.01435945 11.605172375C8.01435945 11.605172375 8.01435945 10.756805625 8.01435945 10.756805625M8.01 435945 6.5157454625C8.8276046625 6.5235067125 9.484837025 7.184620575 9.484837025 7.9998060125C9.484837025 8.815185875 8.8276046625 9.4762985125 8.01435945 9.4840608125C8.01435945 9.4840608125 8.01435945 6.5157454625 8.01435945 6.5157454625M1.0 7.9998060125C1.0 11.8659705 4.1338360375 15.0 8.0000000875 15.0C11.8659705 15.0 15.0 11.8659705 15.0 7.9998060125C15.0 4.1338360375 11.8659705 1.0 8.0000000875 1.0C4.1338360375 1.0 1.0 4.1338360375 1.0 7.9998060125C1.0 7.9998060125 1.0 7.9998060125 1.0 7.9998060125" fill-rule="even-odd" fill-opacity="context-fill-opacity" fill="context-fill" /> </svg> diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn index 680893a66140..1d0f9a455ad0 100644 --- a/browser/themes/shared/jar.inc.mn +++ b/browser/themes/shared/jar.inc.mn @@ -59,8 +59,8 @@ skin/classic/browser/connection-mixed-passive-loaded.svg (../shared/identity-block/connection-mixed-passive-loaded.svg) skin/classic/browser/connection-mixed-active-loaded.svg (../shared/identity-block/connection-mixed-active-loaded.svg) skin/classic/browser/onion.svg (../shared/identity-block/onion.svg) - skin/classic/browser/onion-lock.svg (../shared/identity-block/onion-lock.svg) - skin/classic/browser/onion-disabled.svg (../shared/identity-block/onion-disabled.svg) + skin/classic/browser/onion-slash.svg (../shared/identity-block/onion-slash.svg) + skin/classic/browser/onion-warning.svg (../shared/identity-block/onion-warning.svg) skin/classic/browser/identity-icon.svg (../shared/identity-block/identity-icon.svg) skin/classic/browser/identity-icon-notice.svg (../shared/identity-block/identity-icon-notice.svg) skin/classic/browser/info.svg (../shared/info.svg)

1 0

[tor-browser-build/master] Bug 32991: TBB Project For ZSTD
by boklm＠torproject.org 02 Mar '20

02 Mar '20

commit e96c9adc8857312871349cf5cfa3dcead71a3ff6 Author: sisbell <shane.isbell(a)gmail.com> Date: Mon Feb 10 15:52:08 2020 -0800 Bug 32991: TBB Project For ZSTD --- projects/zstd/build | 18 ++++++++++++++++++ projects/zstd/config | 14 ++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/projects/zstd/build b/projects/zstd/build new file mode 100644 index 0000000..3d76a1a --- /dev/null +++ b/projects/zstd/build @@ -0,0 +1,18 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +distdir=/var/tmp/dist/[% project %] +mkdir -p $distdir +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] +export CPPFLAGS=-DZSTD_MULTITHREAD +export CC=[% c("var/configure_host") %]-clang +make -C lib -j[% c("buildconf/num_procs") %] PREFIX=$distdir install +# Only need static libraries +rm $distdir/lib/libzstd.so* +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/zstd/config b/projects/zstd/config new file mode 100644 index 0000000..40fe21c --- /dev/null +++ b/projects/zstd/config @@ -0,0 +1,14 @@ +# vim: filetype=yaml sw=2 +version: 1.4.4 +git_url: https://github.com/facebook/zstd.git +git_hash: 10f0e6993f9d2f682da6d04aa2385b7d53cbb4ee +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 + +input_files: + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]'

1 0

[tor-browser-build/master] Bug 32992: TBB Project for LZMA
by boklm＠torproject.org 02 Mar '20

02 Mar '20

commit bd21fef218312e8c64e932de989a848e98e2027a Author: sisbell <shane.isbell(a)gmail.com> Date: Mon Feb 10 15:47:04 2020 -0800 Bug 32992: TBB Project for LZMA --- keyring/xz.gpg | Bin 0 -> 6513 bytes projects/xz/build | 16 ++++++++++++++++ projects/xz/config | 23 +++++++++++++++++++++++ 3 files changed, 39 insertions(+) diff --git a/keyring/xz.gpg b/keyring/xz.gpg new file mode 100644 index 0000000..75ee11f Binary files /dev/null and b/keyring/xz.gpg differ diff --git a/projects/xz/build b/projects/xz/build new file mode 100644 index 0000000..4ef654c --- /dev/null +++ b/projects/xz/build @@ -0,0 +1,16 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +distdir=/var/tmp/dist/[% project %] +mkdir -p $distdir +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] +./autogen.sh +./configure [% c("var/configure_opt") %] --prefix=$distdir +make -j[% c("buildconf/num_procs") %] install +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/xz/config b/projects/xz/config new file mode 100644 index 0000000..eac35e1 --- /dev/null +++ b/projects/xz/config @@ -0,0 +1,23 @@ +# vim: filetype=yaml sw=2 +version: 5.2.4 +git_url: https://git.tukaani.org/xz.git +git_hash: 'v[% c("version") %]' +tag_gpg_id: 1 +gpg_keyring: xz.gpg +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 + +targets: + android: + var: + arch_deps: + - autopoint + configure_opt_project: --disable-shared --disable-xz --disable-xzdec --disable-lzmadec --disable-lzmainfo --disable-lzma-links --disable-scripts --disable-doc + +input_files: + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]'

1 0

[tor-browser-build/master] Bug 33216: Add Android Host and ABI Info to RBM.conf
by boklm＠torproject.org 02 Mar '20

02 Mar '20

commit 760178fda1e29256fc63013bc27d798fe3fed999 Author: sisbell <shane.isbell(a)gmail.com> Date: Mon Feb 10 15:25:04 2020 -0800 Bug 33216: Add Android Host and ABI Info to RBM.conf --- rbm.conf | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/rbm.conf b/rbm.conf index 97b7850..d7a11c6 100644 --- a/rbm.conf +++ b/rbm.conf @@ -196,6 +196,8 @@ targets: android-armv7: 1 osname: android-armv7 toolchain_arch: arm + configure_host: arm-linux-androideabi + abi: armeabi-v7a torbrowser-android-x86: - android-x86 - android @@ -205,6 +207,8 @@ targets: android-x86: 1 osname: android-x86 toolchain_arch: x86 + configure_host: i686-linux-android + abi: x86 torbrowser-android-x86_64: - android-x86_64 - android @@ -214,6 +218,8 @@ targets: android-x86_64: 1 osname: android-x86_64 toolchain_arch: x86_64 + configure_host: x86_64-linux-android + abi: x86_64 torbrowser-android-aarch64: - android-aarch64 - android @@ -223,6 +229,8 @@ targets: android-aarch64: 1 osname: android-aarch64 toolchain_arch: arm64 + configure_host: aarch64-linux-android + abi: arm64-v8a android: var: android: 1 @@ -247,6 +255,7 @@ targets: - zip - unzip - libtinfo5 + configure_opt: CC=clang --host=[% c("var/configure_host") %] [% c("var/configure_opt_project") %] pre_pkginst: | SNAPSHOT_VERSION=20191201T212855Z

1 0

[tor-browser-build/master] Bug 33215: Android Toolchain: Add NDK bin path to system path
by boklm＠torproject.org 27 Feb '20

27 Feb '20

commit 5acb463da2e24eaf5cea5b78e42facb86d9f5d67 Author: sisbell <shane.isbell(a)gmail.com> Date: Mon Feb 10 14:33:46 2020 -0800 Bug 33215: Android Toolchain: Add NDK bin path to system path --- projects/android-toolchain/config | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 8c9c822..f4f9ecf 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -15,6 +15,7 @@ var: export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle export ANDROID_HOME=$ANDROID_SDK_HOME export GRADLE_USER_HOME=$GRADLE_HOME + export PATH=$PATH:$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin google_repo: https://dl.google.com/android/repository input_files: - project: container-image

1 0

[tor-browser-build/master] Merge remote-tracking branch 'sisbell/bug-33215'
by boklm＠torproject.org 27 Feb '20

27 Feb '20

commit 457b60475f388bfb381abe3796d881fd5dbe7153 Merge: 37eb08f 5acb463 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Feb 27 22:58:45 2020 +0100 Merge remote-tracking branch 'sisbell/bug-33215' projects/android-toolchain/config | 1 + 1 file changed, 1 insertion(+)

1 0

[tor-browser-build/master] Bug 32436: Add lucetc project for RLBox
by boklm＠torproject.org 27 Feb '20

27 Feb '20

commit 37eb08fc9643749d4bfe602b6aca5dc1dcefcaf5 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 12 20:39:47 2020 +0000 Bug 32436: Add lucetc project for RLBox --- projects/lucetc/build | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ projects/lucetc/config | 35 +++++++++++++++++++++++++++++++++++ projects/rust/config | 10 ++++++++-- 3 files changed, 91 insertions(+), 2 deletions(-) diff --git a/projects/lucetc/build b/projects/lucetc/build new file mode 100644 index 0000000..0157cc9 --- /dev/null +++ b/projects/lucetc/build @@ -0,0 +1,48 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +distdir=/var/tmp/dist +builddir=/var/tmp/build/[% project %] + +mkdir -p $distdir +tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/wasi-sysroot') %] +export PATH="/var/tmp/dist/cmake/bin:/var/tmp/dist/clang/bin:/var/tmp/dist/binutils/bin:/var/tmp/dist/rust/bin:$PATH" +export CC=$distdir/clang/bin/clang +export CFLAGS="-L$distdir/clang/lib" +export CXXFLAGS=$CFLAGS +export CXX=$distdir/clang/bin/clang++ +export AR=$distdir/clang/bin/llvm-ar +export RUSTFLAGS="-C linker=$CXX -C link-arg=$CXXFLAGS" +export LUCET_PREFIX=$distdir/[% project %] +export WASI_SYSROOT=$distdir/wasi-sysroot + +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz + +# Now prepare the offline build +# Move the directory for hardcoding the path in .cargo/config +mv /var/tmp/build/[% project %]-[% c('version') %] $builddir +tar -C $builddir -xjf lucetc-vendor.tar.bz2 +cd $builddir +# .cargo exists already, let's just add to it +cat >> .cargo/config << 'EOF' + +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "/var/tmp/build/lucetc/vendor" +EOF + +make -j[% c("buildconf/num_procs") %] build +make install + +cd $distdir +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/lucetc/config b/projects/lucetc/config new file mode 100644 index 0000000..647d83f --- /dev/null +++ b/projects/lucetc/config @@ -0,0 +1,35 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' +version: '[% c("abbrev") %]' +git_hash: 5c22392b5b1aaa60e915c75e92b57391e1e61e6d +git_url: https://github.com/PLSysSec/lucet_sandbox_compiler/ +git_submodule: 1 + +var: + container: + use_container: 1 + +input_files: + - project: container-image + # Our clang still needs GCC parts (libstdc++ for instance) so we include that + # one here even though compilation gets done solely by clang. + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + - name: cmake + project: cmake + - name: clang + project: clang + - name: binutils + project: binutils + - name: rust + project: rust + input_file_var: + # lucetc needs Rust >= 1.36.0 + rust_version: 1.36.0 + prev_version: 1.35.0 + - name: wasi-sysroot + project: wasi-sysroot + # `cargo vendor vendor` in the `lucetc-sandbox-compiler` directory has vendored + # the sources. + - URL: https://people.torproject.org/~gk/mirrors/sources/lucetc-vendor.tar.bz2 + sha256sum: 5a7802834d0d4b9210f323cf69cc305946f22dba4ddaf2c4c0eb6d3621da2c2a diff --git a/projects/rust/config b/projects/rust/config index 848ccd0..13aad3e 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -1,9 +1,15 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 1.34.2 +version: '[% c("input_file_var/rust_version") %]' -var: +# those values can be changed from the input_files section of other +# projects. See projects/lucetc/config and bug 32436. +input_file_var: + rust_version: 1.34.2 prev_version: 1.33.0 + +var: + prev_version: '[% c("input_file_var/prev_version") %]' container: use_container: 1

1 0

[tor-browser-build/master] Bug 32437: Add wasi-sysroot project for RLBox
by boklm＠torproject.org 26 Feb '20

26 Feb '20

commit e8574bbde076ba917f4d3fd3e71c6c7ee10716c4 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 12 20:38:10 2020 +0000 Bug 32437: Add wasi-sysroot project for RLBox --- projects/ninja/build | 21 +++++++++++++++++++++ projects/ninja/config | 16 ++++++++++++++++ projects/wasi-sysroot/build | 32 ++++++++++++++++++++++++++++++++ projects/wasi-sysroot/config | 28 ++++++++++++++++++++++++++++ projects/wasi-sysroot/no-git.patch | 28 ++++++++++++++++++++++++++++ 5 files changed, 125 insertions(+) diff --git a/projects/ninja/build b/projects/ninja/build new file mode 100644 index 0000000..6500ca7 --- /dev/null +++ b/projects/ninja/build @@ -0,0 +1,21 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist/[% project %] +[% IF c("var/linux") %] + [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), + hardened_gcc => 0 }) %] +[% END -%] +[% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] +mkdir /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] + +./configure.py --bootstrap + +mkdir $distdir +cp ninja $distdir +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/ninja/config b/projects/ninja/config new file mode 100644 index 0000000..8615511 --- /dev/null +++ b/projects/ninja/config @@ -0,0 +1,16 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/ninja-build/ninja.git +git_hash: b25c08bda4949192c69cea4cee057887341a2ffc #v1.9.0 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +var: + container: + use_container: 1 + +input_files: + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/linux") %]' + - name: python + project: python diff --git a/projects/wasi-sysroot/build b/projects/wasi-sysroot/build new file mode 100644 index 0000000..5ea885c --- /dev/null +++ b/projects/wasi-sysroot/build @@ -0,0 +1,32 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +# We need a link to our GCC, otherwise the system cc gets used which points to +# /usr/bin/gcc. +[% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), + hardened_gcc => 0 }) %] +ln -s gcc /var/tmp/dist/gcc/bin/cc + +distdir=/var/tmp/dist +builddir=/var/tmp/build/[% project %] +mkdir -p $distdir +tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] +export PATH=/var/tmp/dist/binutils/bin:/var/tmp/dist/cmake/bin:/var/tmp/dist/ninja:$PATH + +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz + +mv /var/tmp/build/[% project %]-[% c('version') %] $builddir +cd $builddir +# We have no .git in our tar ball but the Makefile depends on that. Just +# hard-code the version for now. +patch -p1 < $rootdir/no-git.patch + +make -j[% c("buildconf/num_procs") %] PREFIX=$distdir/[% project %] + +cd $distdir +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/wasi-sysroot/config b/projects/wasi-sysroot/config new file mode 100644 index 0000000..512769b --- /dev/null +++ b/projects/wasi-sysroot/config @@ -0,0 +1,28 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' +version: '[% c("abbrev") %]' +git_hash: 87b7a019472770f08d49cf3b558867dc76ea74eb +git_url: https://github.com/CraneStation/wasi-sdk +git_submodule: 1 + +var: + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - patch + +input_files: + - project: container-image + - name: gcc + project: gcc + - name: binutils + project: binutils + - name: cmake + project: cmake + - name: ninja + project: ninja + - filename: no-git.patch diff --git a/projects/wasi-sysroot/no-git.patch b/projects/wasi-sysroot/no-git.patch new file mode 100644 index 0000000..27c3446 --- /dev/null +++ b/projects/wasi-sysroot/no-git.patch @@ -0,0 +1,28 @@ +From 55a106779cd012f9cf5d6f46a7a3523de9ba93c3 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Sat, 7 Dec 2019 16:12:42 +0000 +Subject: [PATCH] No .git in our tarball + + +diff --git a/Makefile b/Makefile +index f09a901..dc114cb 100644 +--- a/Makefile ++++ b/Makefile +@@ -6,11 +6,11 @@ LLVM_PROJ_DIR?=$(ROOT_DIR)/src/llvm-project + PREFIX?=/opt/wasi-sdk + + CLANG_VERSION=$(shell ./llvm_version.sh $(LLVM_PROJ_DIR)) +-VERSION:=$(shell ./version.sh) +-DEBUG_PREFIX_MAP=-fdebug-prefix-map=$(ROOT_DIR)=wasisdk://v$(VERSION) ++#VERSION:=$(shell ./version.sh) ++DEBUG_PREFIX_MAP=-fdebug-prefix-map=$(ROOT_DIR)=wasisdk://v8.1g5225b05436ce + + default: build +- @echo "Use -fdebug-prefix-map=$(ROOT_DIR)=wasisdk://v$(VERSION)" ++ @echo "Use -fdebug-prefix-map=$(ROOT_DIR)=wasisdk://v8.1g5225b05436ce" + + clean: + rm -rf build $(PREFIX) +-- +2.24.0 +

1 0

[tor-browser-build/master] Release preparations for 9.5a6
by sysrqb＠torproject.org 21 Feb '20

21 Feb '20

commit 02ad765bc59ad20ed2016489826a9edd1e0ad069 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Feb 21 21:58:37 2020 +0000 Release preparations for 9.5a6 Versions bump and Changelog update --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 14 ++++++++++++++ projects/tor-launcher/config | 2 +- rbm.conf | 5 +++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 45a33a0..d101697 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build3' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 51405b3..bdddb44 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,17 @@ +Tor Browser 9.5a6 -- February 27 2020 + * All Platforms + * Translations update + * Windows + OS X + Linux + * Update Tor Launcher to 0.2.21.2 + * Translations update + * Bug 19757: Support on-disk storage of v3 client auth keys + * Bug 19757: Support on-disk storage of v3 client auth keys + * Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT + * Bug 32658: Create a new MAR signing key + * Build System + * All Platforms + * Bug 33380: Add *.json to sha256sums-unsigned-build.txt + Tor Browser 9.5a5 -- February 12 2020 * All Platforms * Update Firefox to 68.5.0esr diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index fec0612..f96c10f 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.21.1 +version: 0.2.21.2 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index f5f35c1..97b7850 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.5a5' - torbrowser_build: 'build2' + torbrowser_version: '9.5a6' + torbrowser_build: 'build1' torbrowser_incremental_from: - 9.5a4 + - 9.5a5 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Fold in stable changelog for 9.0.5
by sysrqb＠torproject.org 21 Feb '20

21 Feb '20

commit ff2a021d1d39acf3f2983d971834c56c61393511 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Feb 21 20:13:10 2020 +0000 Fold in stable changelog for 9.0.5 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 72bb219..51405b3 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -27,6 +27,23 @@ Tor Browser 9.5a5 -- February 12 2020 * OS X * Bug 33200: Fix permissions on bookmarks.html +Tor Browser 9.0.5 -- February 11 2020 + * All Platforms + * Update Firefox to 68.5.0esr + * Bump NoScript to 11.0.13 + * Bug 32053: Fix LLVM reproducibility issues + * Bug 32255: Missing ORIGIN header breaks CORS + * Bug 32891: Add new default bridges + * Windows + OS X + Linux + * Bump Tor to 0.4.2.6 + * Windows + * Bug 32132: Re-enable jemalloc for Windows users + * Build System + * All Platforms + * Bug 32739: Bump clang to 8.0.1 + * OS X + * Bug 33200: Fix permissions on bookmarks.html + Tor Browser 9.5a4 -- January 10 2020 * All Platforms * Update Firefox to 68.4.1esr

1 0

[tor-browser/tor-browser-68.5.0esr-9.5-1] fixup! Pick up latest Torbutton code
by sysrqb＠torproject.org 21 Feb '20

21 Feb '20

commit 9e9300163c9074f9b12691d42aefc489e27729ef Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Feb 21 21:26:14 2020 +0000 fixup! Pick up latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index f87cd0af7462..078ae18e5f1c 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit f87cd0af7462faab1d349e28e7b17c76274624b0 +Subproject commit 078ae18e5f1cbf888e7c86c8aecaa383a727bf0d

1 0

[tor-browser/tor-browser-68.5.0esr-9.5-1] squash! Bug 30237: Add v3 onion services client authentication prompt
by sysrqb＠torproject.org 21 Feb '20

21 Feb '20

commit aed69dc95387429e18b18ad578fb78d4a83d91f2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Feb 13 15:06:38 2020 -0500 squash! Bug 30237: Add v3 onion services client authentication prompt Also fixes bug 19757: Add a "Remember this key" checkbox to the client auth prompt. Add an "Onion Services Authentication" section within the about:preferences "Privacy & Security section" to allow viewing and removal of v3 onion client auth keys that have been stored on disk. --- .../onionservices/content/authPopup.inc.xul | 2 + .../onionservices/content/authPreferences.css | 20 ++ .../onionservices/content/authPreferences.inc.xul | 20 ++ .../onionservices/content/authPreferences.js | 63 +++++ .../components/onionservices/content/authPrompt.js | 40 ++-- .../components/onionservices/content/authUtil.jsm | 27 ++- .../onionservices/content/savedKeysDialog.js | 259 +++++++++++++++++++++ .../onionservices/content/savedKeysDialog.xul | 42 ++++ browser/components/onionservices/jar.mn | 4 + .../preferences/in-content/preferences.xul | 1 + .../components/preferences/in-content/privacy.js | 7 + .../components/preferences/in-content/privacy.xul | 2 + browser/modules/TorStrings.jsm | 15 +- 13 files changed, 477 insertions(+), 25 deletions(-) diff --git a/browser/components/onionservices/content/authPopup.inc.xul b/browser/components/onionservices/content/authPopup.inc.xul index d327e4c6a88d..bd0ec3aa0b00 100644 --- a/browser/components/onionservices/content/authPopup.inc.xul +++ b/browser/components/onionservices/content/authPopup.inc.xul @@ -9,6 +9,8 @@ <html:div> <html:input id="tor-clientauth-notification-key" type="password"/> <html:div id="tor-clientauth-warning"/> + <checkbox id="tor-clientauth-persistkey-checkbox" + label="&torbutton.onionServices.authPrompt.persistCheckboxLabel;"/> </html:div> </popupnotificationcontent> </popupnotification> diff --git a/browser/components/onionservices/content/authPreferences.css b/browser/components/onionservices/content/authPreferences.css new file mode 100644 index 000000000000..b3fb79b26ddc --- /dev/null +++ b/browser/components/onionservices/content/authPreferences.css @@ -0,0 +1,20 @@ +/* Copyright (c) 2020, The Tor Project, Inc. */ + +#torOnionServiceKeys-overview-container { + margin-right: 30px; +} + +#onionservices-savedkeys-tree treechildren::-moz-tree-cell-text { + font-size: 80%; +} + +#onionservices-savedkeys-errorContainer { + margin-top: 4px; + min-height: 3em; +} + +#onionservices-savedkeys-errorIcon { + margin-right: 4px; + list-style-image: url("chrome://browser/skin/warning.svg"); + visibility: hidden; +} diff --git a/browser/components/onionservices/content/authPreferences.inc.xul b/browser/components/onionservices/content/authPreferences.inc.xul new file mode 100644 index 000000000000..0b6ce98efa31 --- /dev/null +++ b/browser/components/onionservices/content/authPreferences.inc.xul @@ -0,0 +1,20 @@ +# Copyright (c) 2020, The Tor Project, Inc. + +<groupbox id="torOnionServiceKeys" orient="vertical" + data-category="panePrivacy" hidden="true"> + <label><html:h2 id="torOnionServiceKeys-header"/></label> + <hbox> + <description id="torOnionServiceKeys-overview-container" flex="1"> + <html:span id="torOnionServiceKeys-overview" + class="tail-with-learn-more"/> + <label id="torOnionServiceKeys-learnMore" class="learnMore text-link" + is="text-link"/> + </description> + <vbox align="end"> + <button id="torOnionServiceKeys-savedKeys" + is="highlightable-button" + class="accessory-button" + oncommand="OnionServicesAuthPreferences.onViewSavedKeys()"/> + </vbox> + </hbox> +</groupbox> diff --git a/browser/components/onionservices/content/authPreferences.js b/browser/components/onionservices/content/authPreferences.js new file mode 100644 index 000000000000..c388fbee6b3e --- /dev/null +++ b/browser/components/onionservices/content/authPreferences.js @@ -0,0 +1,63 @@ +// Copyright (c) 2020, The Tor Project, Inc. + +"use strict"; + +ChromeUtils.defineModuleGetter( + this, + "TorStrings", + "resource:///modules/TorStrings.jsm" +); + +/* + Onion Services Client Authentication Preferences Code + + Code to handle init and update of onion services authentication section + in about:preferences#privacy +*/ + +const OnionServicesAuthPreferences = { + selector: { + groupBox: "#torOnionServiceKeys", + header: "#torOnionServiceKeys-header", + overview: "#torOnionServiceKeys-overview", + learnMore: "#torOnionServiceKeys-learnMore", + savedKeysButton: "#torOnionServiceKeys-savedKeys", + }, + + init() { + // populate XUL with localized strings + this._populateXUL(); + }, + + _populateXUL() { + const groupbox = document.querySelector(this.selector.groupBox); + + let elem = groupbox.querySelector(this.selector.header); + elem.textContent = TorStrings.onionServices.authPreferences.header; + + elem = groupbox.querySelector(this.selector.overview); + elem.textContent = TorStrings.onionServices.authPreferences.overview; + + elem = groupbox.querySelector(this.selector.learnMore); + elem.setAttribute("value", TorStrings.onionServices.learnMore); + elem.setAttribute("href", TorStrings.onionServices.learnMoreURL); + + elem = groupbox.querySelector(this.selector.savedKeysButton); + elem.setAttribute( + "label", + TorStrings.onionServices.authPreferences.savedKeys + ); + }, + + onViewSavedKeys() { + gSubDialog.open( + "chrome://browser/content/onionservices/savedKeysDialog.xul" + ); + }, +}; // OnionServicesAuthPreferences + +Object.defineProperty(this, "OnionServicesAuthPreferences", { + value: OnionServicesAuthPreferences, + enumerable: true, + writable: false, +}); diff --git a/browser/components/onionservices/content/authPrompt.js b/browser/components/onionservices/content/authPrompt.js index 2d4ebcafd688..f7a10e75158a 100644 --- a/browser/components/onionservices/content/authPrompt.js +++ b/browser/components/onionservices/content/authPrompt.js @@ -56,14 +56,14 @@ const OnionAuthPrompt = (function() { }; this._prompt = PopupNotifications.show(this._browser, - OnionAuthUtil.string.notificationID, "", - OnionAuthUtil.string.anchorID, + OnionAuthUtil.domid.notification, "", + OnionAuthUtil.domid.anchor, mainAction, [cancelAction], options); }, _onPromptShowing(aWarningMessage) { let xulDoc = this._browser.ownerDocument; - let descElem = xulDoc.getElementById(OnionAuthUtil.string.descriptionID); + let descElem = xulDoc.getElementById(OnionAuthUtil.domid.description); if (descElem) { // Handle replacement of the onion name within the localized // string ourselves so we can show the onion name as bold text. @@ -89,7 +89,7 @@ const OnionAuthPrompt = (function() { span.textContent = prefix; descElem.appendChild(span); span = xulDoc.createElementNS(kHTMLNS, "span"); - span.id = OnionAuthUtil.string.onionNameSpanID; + span.id = OnionAuthUtil.domid.onionNameSpan; span.textContent = this._onionName; descElem.appendChild(span); span = xulDoc.createElementNS(kHTMLNS, "span"); @@ -98,13 +98,17 @@ const OnionAuthPrompt = (function() { } // Set "Learn More" label and href. - let learnMoreElem = xulDoc.getElementById(OnionAuthUtil.string.learnMoreID); + let learnMoreElem = xulDoc.getElementById(OnionAuthUtil.domid.learnMore); if (learnMoreElem) { learnMoreElem.setAttribute("value", TorStrings.onionServices.learnMore); learnMoreElem.setAttribute("href", TorStrings.onionServices.learnMoreURL); } this._showWarning(aWarningMessage); + let checkboxElem = this._getCheckboxElement(); + if (checkboxElem) { + checkboxElem.checked = false; + } }, _onPromptShown() { @@ -170,7 +174,9 @@ const OnionAuthPrompt = (function() { this.show(controllerFailureMsg); }); let onionAddr = this._onionName.toLowerCase().replace(/\.onion$/, ""); - torController.onionAuthAdd(onionAddr, base64key) + let checkboxElem = this._getCheckboxElement(); + let isPermanent = (checkboxElem && checkboxElem.checked); + torController.onionAuthAdd(onionAddr, base64key, isPermanent) .then(aResponse => { // Success! Reload the page. this._browser.messageManager.sendAsyncMessage("Browser:Reload", {}); @@ -189,19 +195,24 @@ const OnionAuthPrompt = (function() { _onCancel() { // Arrange for an error page to be displayed. this._browser.messageManager.sendAsyncMessage( - OnionAuthUtil.string.authPromptCanceledMessage, + OnionAuthUtil.message.authPromptCanceled, {failedURI: this._failedURI.spec}); }, _getKeyElement() { let xulDoc = this._browser.ownerDocument; - return xulDoc.getElementById(OnionAuthUtil.string.keyElementID); + return xulDoc.getElementById(OnionAuthUtil.domid.keyElement); + }, + + _getCheckboxElement() { + let xulDoc = this._browser.ownerDocument; + return xulDoc.getElementById(OnionAuthUtil.domid.checkboxElement); }, _showWarning(aWarningMessage) { let xulDoc = this._browser.ownerDocument; let warningElem = - xulDoc.getElementById(OnionAuthUtil.string.warningElementID); + xulDoc.getElementById(OnionAuthUtil.domid.warningElement); let keyElem = this._getKeyElement(); if (warningElem) { if (aWarningMessage) { @@ -225,9 +236,12 @@ const OnionAuthPrompt = (function() { let base64key; if (aKeyString.length == 52) { // The key is probably base32-encoded. Attempt to decode. + // Although base32 specifies uppercase letters, we accept lowercase + // as well because users may type in lowercase or copy a key out of + // a tor onion-auth file (which uses lowercase). let rawKey; try { - rawKey = CommonUtils.decodeBase32(aKeyString); + rawKey = CommonUtils.decodeBase32(aKeyString.toUpperCase()); } catch (e) {} if (rawKey) try { @@ -247,17 +261,17 @@ const OnionAuthPrompt = (function() { let retval = { init() { - Services.obs.addObserver(this, OnionAuthUtil.string.authPromptTopic); + Services.obs.addObserver(this, OnionAuthUtil.topic.authPrompt); }, uninit() { - Services.obs.removeObserver(this, OnionAuthUtil.string.authPromptTopic); + Services.obs.removeObserver(this, OnionAuthUtil.topic.authPrompt); }, // aSubject is the DOM Window or browser where the prompt should be shown. // aData contains the .onion name. observe(aSubject, aTopic, aData) { - if (aTopic != OnionAuthUtil.string.authPromptTopic) { + if (aTopic != OnionAuthUtil.topic.authPrompt) { return; } diff --git a/browser/components/onionservices/content/authUtil.jsm b/browser/components/onionservices/content/authUtil.jsm index 8547fba83a62..e9446f51cfcb 100644 --- a/browser/components/onionservices/content/authUtil.jsm +++ b/browser/components/onionservices/content/authUtil.jsm @@ -9,20 +9,25 @@ var EXPORTED_SYMBOLS = [ var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const OnionAuthUtil = { - string: { - authPromptTopic: "tor-onion-services-auth-prompt", - authPromptCanceledMessage: "Tor:OnionServicesAuthPromptCanceled", - anchorID: "tor-clientauth-notification-icon", - notificationID: "tor-clientauth", - descriptionID: "tor-clientauth-notification-desc", - learnMoreID: "tor-clientauth-notification-learnmore", - onionNameSpanID: "tor-clientauth-notification-onionname", - keyElementID: "tor-clientauth-notification-key", - warningElementID: "tor-clientauth-warning", + topic: { + authPrompt: "tor-onion-services-auth-prompt", + }, + message: { + authPromptCanceled: "Tor:OnionServicesAuthPromptCanceled", + }, + domid: { + anchor: "tor-clientauth-notification-icon", + notification: "tor-clientauth", + description: "tor-clientauth-notification-desc", + learnMore: "tor-clientauth-notification-learnmore", + onionNameSpan: "tor-clientauth-notification-onionname", + keyElement: "tor-clientauth-notification-key", + warningElement: "tor-clientauth-warning", + checkboxElement: "tor-clientauth-persistkey-checkbox", }, addCancelMessageListener(aTabContent, aDocShell) { - aTabContent.addMessageListener(this.string.authPromptCanceledMessage, + aTabContent.addMessageListener(this.message.authPromptCanceled, (aMessage) => { let failedURI = Services.io.newURI(aMessage.data.failedURI); aDocShell.displayLoadError(Cr.NS_ERROR_CONNECTION_REFUSED, failedURI, diff --git a/browser/components/onionservices/content/savedKeysDialog.js b/browser/components/onionservices/content/savedKeysDialog.js new file mode 100644 index 000000000000..b1376bbabe85 --- /dev/null +++ b/browser/components/onionservices/content/savedKeysDialog.js @@ -0,0 +1,259 @@ +// Copyright (c) 2020, The Tor Project, Inc. + +"use strict"; + +ChromeUtils.defineModuleGetter( + this, + "TorStrings", + "resource:///modules/TorStrings.jsm" +); + +ChromeUtils.defineModuleGetter( + this, + "controller", + "resource://torbutton/modules/tor-control-port.js" +); + +var gOnionServicesSavedKeysDialog = { + selector: { + dialog: "#onionservices-savedkeys-dialog", + intro: "#onionservices-savedkeys-intro", + tree: "#onionservices-savedkeys-tree", + onionSiteCol: "#onionservices-savedkeys-siteCol", + onionKeyCol: "#onionservices-savedkeys-keyCol", + errorIcon: "#onionservices-savedkeys-errorIcon", + errorMessage: "#onionservices-savedkeys-errorMessage", + removeButton: "#onionservices-savedkeys-remove", + removeAllButton: "#onionservices-savedkeys-removeall", + }, + + _tree: undefined, + _isBusy: false, // true when loading data, deleting a key, etc. + + // Public functions (called from outside this file). + async deleteSelectedKeys() { + this._setBusyState(true); + + const indexesToDelete = []; + const count = this._tree.view.selection.getRangeCount(); + for (let i = 0; i < count; ++i) { + const minObj = {}; + const maxObj = {}; + this._tree.view.selection.getRangeAt(i, minObj, maxObj); + for (let idx = minObj.value; idx <= maxObj.value; ++idx) { + indexesToDelete.push(idx); + } + } + + if (indexesToDelete.length > 0) { + const controllerFailureMsg = + TorStrings.onionServices.authPreferences.failedToRemoveKey; + try { + const torController = controller(aError => { + this._showError(controllerFailureMsg); + }); + + // Remove in reverse index order to avoid issues caused by index changes. + for (let i = indexesToDelete.length - 1; i >= 0; --i) { + await this._deleteOneKey(torController, indexesToDelete[i]); + } + } catch (e) { + if (e.torMessage) { + this._showError(e.torMessage); + } else { + this._showError(controllerFailureMsg); + } + } + } + + this._setBusyState(false); + }, + + async deleteAllKeys() { + this._tree.view.selection.selectAll(); + await this.deleteSelectedKeys(); + }, + + updateButtonsState() { + const haveSelection = this._tree.view.selection.getRangeCount() > 0; + const dialog = document.querySelector(this.selector.dialog); + const removeSelectedBtn = dialog.querySelector(this.selector.removeButton); + removeSelectedBtn.disabled = this._isBusy || !haveSelection; + const removeAllBtn = dialog.querySelector(this.selector.removeAllButton); + removeAllBtn.disabled = this._isBusy || this.rowCount === 0; + }, + + // Private functions. + _onLoad() { + document.mozSubdialogReady = this._init(); + }, + + async _init() { + await this._populateXUL(); + + window.addEventListener("keypress", this._onWindowKeyPress.bind(this)); + + // We don't use await here because we want _loadSavedKeys() to run + // in the background and not block loading of this dialog. + this._loadSavedKeys(); + }, + + async _populateXUL() { + const dialog = document.querySelector(this.selector.dialog); + const authPrefStrings = TorStrings.onionServices.authPreferences; + dialog.setAttribute("title", authPrefStrings.dialogTitle); + + let elem = dialog.querySelector(this.selector.intro); + elem.textContent = authPrefStrings.dialogIntro; + + elem = dialog.querySelector(this.selector.onionSiteCol); + elem.setAttribute("label", authPrefStrings.onionSite); + + elem = dialog.querySelector(this.selector.onionKeyCol); + elem.setAttribute("label", authPrefStrings.onionKey); + + elem = dialog.querySelector(this.selector.removeButton); + elem.setAttribute("label", authPrefStrings.remove); + + elem = dialog.querySelector(this.selector.removeAllButton); + elem.setAttribute("label", authPrefStrings.removeAll); + + this._tree = dialog.querySelector(this.selector.tree); + }, + + async _loadSavedKeys() { + const controllerFailureMsg = + TorStrings.onionServices.authPreferences.failedToGetKeys; + this._setBusyState(true); + + try { + this._tree.view = this; + + const torController = controller(aError => { + this._showError(controllerFailureMsg); + }); + + const keyInfoList = await torController.onionAuthViewKeys(); + if (keyInfoList) { + // Filter out temporary keys. + this._keyInfoList = keyInfoList.filter(aKeyInfo => { + if (!aKeyInfo.Flags) { + return false; + } + + const flags = aKeyInfo.Flags.split(","); + return flags.includes("Permanent"); + }); + + // Sort by the .onion address. + this._keyInfoList.sort((aObj1, aObj2) => { + const hsAddr1 = aObj1.hsAddress.toLowerCase(); + const hsAddr2 = aObj2.hsAddress.toLowerCase(); + if (hsAddr1 < hsAddr2) { + return -1; + } + return hsAddr1 > hsAddr2 ? 1 : 0; + }); + } + + // Render the tree content. + this._tree.rowCountChanged(0, this.rowCount); + } catch (e) { + if (e.torMessage) { + this._showError(e.torMessage); + } else { + this._showError(controllerFailureMsg); + } + } + + this._setBusyState(false); + }, + + // This method may throw; callers should catch errors. + async _deleteOneKey(aTorController, aIndex) { + const keyInfoObj = this._keyInfoList[aIndex]; + await aTorController.onionAuthRemove(keyInfoObj.hsAddress); + this._tree.view.selection.clearRange(aIndex, aIndex); + this._keyInfoList.splice(aIndex, 1); + this._tree.rowCountChanged(aIndex + 1, -1); + }, + + _setBusyState(aIsBusy) { + this._isBusy = aIsBusy; + this.updateButtonsState(); + }, + + _onWindowKeyPress(event) { + if (event.keyCode === KeyEvent.DOM_VK_ESCAPE) { + window.close(); + } else if (event.keyCode === KeyEvent.DOM_VK_DELETE) { + this.deleteSelectedKeys(); + } + }, + + _showError(aMessage) { + const dialog = document.querySelector(this.selector.dialog); + const errorIcon = dialog.querySelector(this.selector.errorIcon); + errorIcon.style.visibility = aMessage ? "visible" : "hidden"; + const errorDesc = dialog.querySelector(this.selector.errorMessage); + errorDesc.textContent = aMessage ? aMessage : ""; + }, + + // XUL tree widget view implementation. + get rowCount() { + return this._keyInfoList ? this._keyInfoList.length : 0; + }, + + getCellText(aRow, aCol) { + let val = ""; + if (this._keyInfoList && aRow < this._keyInfoList.length) { + const keyInfo = this._keyInfoList[aRow]; + if (aCol.id.endsWith("-siteCol")) { + val = keyInfo.hsAddress; + } else if (aCol.id.endsWith("-keyCol")) { + val = keyInfo.typeAndKey; + // Omit keyType because it is always "x25519". + const idx = val.indexOf(":"); + if (idx > 0) { + val = val.substring(idx + 1); + } + } + } + + return val; + }, + + isSeparator(index) { + return false; + }, + + isSorted() { + return false; + }, + + isContainer(index) { + return false; + }, + + setTree(tree) {}, + + getImageSrc(row, column) {}, + + getCellValue(row, column) {}, + + cycleHeader(column) {}, + + getRowProperties(row) { + return ""; + }, + + getColumnProperties(column) { + return ""; + }, + + getCellProperties(row, column) { + return ""; + }, +}; + +window.addEventListener("load", () => gOnionServicesSavedKeysDialog._onLoad()); diff --git a/browser/components/onionservices/content/savedKeysDialog.xul b/browser/components/onionservices/content/savedKeysDialog.xul new file mode 100644 index 000000000000..3db9bb05ea82 --- /dev/null +++ b/browser/components/onionservices/content/savedKeysDialog.xul @@ -0,0 +1,42 @@ +<?xml version="1.0"?> + + +<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?> +<?xml-stylesheet href="chrome://browser/content/onionservices/authPreferences.css" type="text/css"?> + +<window id="onionservices-savedkeys-dialog" + windowtype="OnionServices:SavedKeys" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + style="width: 45em;"> + + <script src="chrome://browser/content/onionservices/savedKeysDialog.js"/> + + <vbox id="onionservices-savedkeys" class="contentPane" flex="1"> + <label id="onionservices-savedkeys-intro" + control="onionservices-savedkeys-tree"/> + <separator class="thin"/> + <tree id="onionservices-savedkeys-tree" flex="1" hidecolumnpicker="true" + width="750" + style="height: 20em;" + onselect="gOnionServicesSavedKeysDialog.updateButtonsState();"> + <treecols> + <treecol id="onionservices-savedkeys-siteCol" flex="1" persist="width"/> + <splitter class="tree-splitter"/> + <treecol id="onionservices-savedkeys-keyCol" flex="1" persist="width"/> + </treecols> + <treechildren/> + </tree> + <hbox id="onionservices-savedkeys-errorContainer" align="baseline" flex="1"> + <image id="onionservices-savedkeys-errorIcon"/> + <description id="onionservices-savedkeys-errorMessage" flex="1"/> + </hbox> + <separator class="thin"/> + <hbox id="onionservices-savedkeys-buttons"> + <button id="onionservices-savedkeys-remove" disabled="true" + oncommand="gOnionServicesSavedKeysDialog.deleteSelectedKeys();"/> + <button id="onionservices-savedkeys-removeall" + oncommand="gOnionServicesSavedKeysDialog.deleteAllKeys();"/> + </hbox> + </vbox> +</window> diff --git a/browser/components/onionservices/jar.mn b/browser/components/onionservices/jar.mn index 06cf2df6e7ac..583ab77bc6d8 100644 --- a/browser/components/onionservices/jar.mn +++ b/browser/components/onionservices/jar.mn @@ -1,4 +1,8 @@ browser.jar: + content/browser/onionservices/authPreferences.css (content/authPreferences.css) + content/browser/onionservices/authPreferences.js (content/authPreferences.js) content/browser/onionservices/authPrompt.js (content/authPrompt.js) content/browser/onionservices/authUtil.jsm (content/authUtil.jsm) content/browser/onionservices/onionservices.css (content/onionservices.css) + content/browser/onionservices/savedKeysDialog.js (content/savedKeysDialog.js) + content/browser/onionservices/savedKeysDialog.xul (content/savedKeysDialog.xul) diff --git a/browser/components/preferences/in-content/preferences.xul b/browser/components/preferences/in-content/preferences.xul index 7a01443ab048..30915e3d358f 100644 --- a/browser/components/preferences/in-content/preferences.xul +++ b/browser/components/preferences/in-content/preferences.xul @@ -15,6 +15,7 @@ <?xml-stylesheet href="chrome://browser/skin/preferences/in-content/search.css"?> <?xml-stylesheet href="chrome://browser/skin/preferences/in-content/containers.css"?> <?xml-stylesheet href="chrome://browser/skin/preferences/in-content/privacy.css"?> +<?xml-stylesheet href="chrome://browser/content/onionservices/authPreferences.css"?> <?xml-stylesheet href="chrome://browser/content/securitylevel/securityLevelPreferences.css"?> <?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?> diff --git a/browser/components/preferences/in-content/privacy.js b/browser/components/preferences/in-content/privacy.js index 297d07fadf1f..ee86b4158d7c 100644 --- a/browser/components/preferences/in-content/privacy.js +++ b/browser/components/preferences/in-content/privacy.js @@ -62,6 +62,12 @@ XPCOMUtils.defineLazyGetter(this, "AlertsServiceDND", function() { } }); +XPCOMUtils.defineLazyScriptGetter( + this, + ["OnionServicesAuthPreferences"], + "chrome://browser/content/onionservices/authPreferences.js" +); + // TODO: module import via ChromeUtils.defineModuleGetter XPCOMUtils.defineLazyScriptGetter( this, @@ -369,6 +375,7 @@ var gPrivacyPane = { this.trackingProtectionReadPrefs(); this.networkCookieBehaviorReadPrefs(); this._initTrackingProtectionExtensionControl(); + OnionServicesAuthPreferences.init(); this._initSecurityLevel(); Services.telemetry.setEventRecordingEnabled("pwmgr", true); diff --git a/browser/components/preferences/in-content/privacy.xul b/browser/components/preferences/in-content/privacy.xul index 013fe147bc82..e807ac69f1f1 100644 --- a/browser/components/preferences/in-content/privacy.xul +++ b/browser/components/preferences/in-content/privacy.xul @@ -468,6 +468,8 @@ </hbox> </groupbox> +#include ../../onionservices/content/authPreferences.inc.xul +  <groupbox id="formAutofillGroupBox" diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm index f68d60cf1343..e9a8b3969297 100644 --- a/browser/modules/TorStrings.jsm +++ b/browser/modules/TorStrings.jsm @@ -329,7 +329,7 @@ var TorStrings = { }; let retval = { - learnMore: getString("torPreferences.learnMore", "Learn More"), + learnMore: getString("learnMore", "Learn more"), learnMoreURL: `https://2019.www.torproject.org/docs/tor-manual-dev.html.${getLocale()}#_client_authorization`, authPrompt: { description: @@ -341,6 +341,19 @@ var TorStrings = { failedToSetKey: getString("authPrompt.failedToSetKey", "Failed to set key"), }, + authPreferences: { + header: getString("authPreferences.header", "Onion Services Authentication"), + overview: getString("authPreferences.overview", "Some onion services require that you identify yourself with a key"), + savedKeys: getString("authPreferences.savedKeys", "Saved Keys"), + dialogTitle: getString("authPreferences.dialogTitle", "Onion Services Keys"), + dialogIntro: getString("authPreferences.dialogIntro", "Keys for the following onionsites are stored on your computer"), + onionSite: getString("authPreferences.onionSite", "Onionsite"), + onionKey: getString("authPreferences.onionKey", "Key"), + remove: getString("authPreferences.remove", "Remove"), + removeAll: getString("authPreferences.removeAll", "Remove All"), + failedToGetKeys: getString("authPreferences.failedToGetKeys", "Failed to get keys"), + failedToRemoveKey: getString("authPreferences.failedToRemoveKey", "Failed to remove key"), + }, }; return retval;

1 0

[tor-launcher/master] Bug 19757: Support on-disk storage of v3 client auth keys
by sysrqb＠torproject.org 21 Feb '20

21 Feb '20

commit 6ceda2e5565702f13933b83653c1951789fc0252 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Dec 4 09:48:08 2019 -0500 Bug 19757: Support on-disk storage of v3 client auth keys Create a client-auth directory within the Tor data directory and use it. --- src/components/tl-process.js | 7 ++++++- src/modules/tl-util.jsm | 13 ++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 49abc0a..1cad103 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -1,4 +1,4 @@ -// Copyright (c) 2018, The Tor Project, Inc. +// Copyright (c) 2020, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -372,6 +372,7 @@ TorProcessService.prototype = // Get the Tor data directory first so it is created before we try to // construct paths to files that will be inside it. var dataDir = TorLauncherUtil.getTorFile("tordatadir", true); + var onionAuthDir = TorLauncherUtil.getTorFile("toronionauthdir", true); var exeFile = TorLauncherUtil.getTorFile("tor", false); var torrcFile = TorLauncherUtil.getTorFile("torrc", true); var torrcDefaultsFile = @@ -388,6 +389,8 @@ TorProcessService.prototype = detailsKey = "torrc_missing"; else if (!dataDir) detailsKey = "datadir_missing"; + else if (!onionAuthDir) + detailsKey = "onionauthdir_missing"; else if (!hashedPassword) detailsKey = "password_hash_missing"; @@ -418,6 +421,8 @@ TorProcessService.prototype = args.push(torrcFile.path); args.push("DataDirectory"); args.push(dataDir.path); + args.push("ClientOnionAuthDir"); + args.push(onionAuthDir.path); args.push("GeoIPFile"); args.push(geoipFile.path); args.push("GeoIPv6File"); diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index c54acb9..b721372 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -1,4 +1,4 @@ -// Copyright (c) 2019, The Tor Project, Inc. +// Copyright (c) 2020, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -571,6 +571,8 @@ let TorLauncherUtil = // Public path = "Tor\\torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; + else if ("toronionauthdir" == aTorFileType) + path = "Tor\\onion-auth"; else if ("pt-profiles-dir" == aTorFileType) path = "Tor\\PluggableTransports"; } @@ -586,6 +588,8 @@ let TorLauncherUtil = // Public path = "Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; + else if ("toronionauthdir" == aTorFileType) + path = "Tor/onion-auth"; else if ("pt-profiles-dir" == aTorFileType) path = "Tor/PluggableTransports"; else if (isIPC) @@ -603,6 +607,8 @@ let TorLauncherUtil = // Public path = "Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; + else if ("toronionauthdir" == aTorFileType) + path = "Tor/onion-auth"; else if ("pt-profiles-dir" == aTorFileType) path = "Tor/PluggableTransports"; else if (isIPC) @@ -622,6 +628,8 @@ let TorLauncherUtil = // Public path = "Data\\Tor\\torrc"; else if ("tordatadir" == aTorFileType) path = "Data\\Tor"; + else if ("toronionauthdir" == aTorFileType) + path = "Data\\Tor\\onion-auth"; else if ("pt-profiles-dir" == aTorFileType) path = "Data\\Browser"; } @@ -638,6 +646,8 @@ let TorLauncherUtil = // Public path = "Data/Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Data/Tor"; + else if ("toronionauthdir" == aTorFileType) + path = "Data/Tor/onion-auth"; else if ("pt-profiles-dir" == aTorFileType) path = "Data/Browser"; else if (isIPC) @@ -683,6 +693,7 @@ let TorLauncherUtil = // Public try { if (("tordatadir" == aTorFileType) || + ("toronionauthdir" == aTorFileType) || ("pt-profiles-dir" == aTorFileType)) { torFile.create(torFile.DIRECTORY_TYPE, 0o700);

1 0

[tor-launcher/master] Translations update
by sysrqb＠torproject.org 21 Feb '20

21 Feb '20

commit cb34de3fc8d80049c6bd526e56efc6df75b3a621 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Feb 21 20:54:43 2020 +0000 Translations update --- src/chrome/locale/ja/torlauncher.properties | 2 +- src/chrome/locale/sv-SE/network-settings.dtd | 4 ++-- src/chrome/locale/vi/network-settings.dtd | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties index c452259..38ef19a 100644 --- a/src/chrome/locale/ja/torlauncher.properties +++ b/src/chrome/locale/ja/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited_during_startup=Tor が起動中に終了しました。これは、torrc ファイルの誤りや、Tor または他のプログラムのバグ、もしくはハードウェアの故障に起因しているかもしれません。問題を解決して Tor を再起動するまで、Tor Browser は起動されません。 -torlauncher.tor_exited=Tor が突然終了しました。原因はおそらく Tor 自体のバグか、他の常駐プログラムか、あるいはハードウェアーが問題です。Tor を再起動するまで、Tor ブラウザーはウェブサイトに一切接続できません。再起動しても解決されない場合、Tor ログファイルをサポートチームに送信してください。 +torlauncher.tor_exited=Tor が突然終了しました。原因はおそらく Tor 自体のバグか、他の常駐プログラムか、あるいはハードウェアーが問題です。Tor を再起動するまで、 Tor Browser はウェブサイトに一切接続できません。再起動しても解決されない場合、Tor ログファイルをサポートチームに送信してください。 torlauncher.tor_exited2=Tor を再起動しても、あなたのブラウザータブはそのまま残ります。 torlauncher.tor_controlconn_failed=Torのコントロールポートに接続出来ませんでした。 torlauncher.tor_failed_to_start=Torは開始出来ませんでした。 diff --git a/src/chrome/locale/sv-SE/network-settings.dtd b/src/chrome/locale/sv-SE/network-settings.dtd index a31aa57..05823df 100644 --- a/src/chrome/locale/sv-SE/network-settings.dtd +++ b/src/chrome/locale/sv-SE/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Klicka på "Anslut" för att ansluta till Tor."> -<!ENTITY torSettings.configurePrompt "Klicka "Konfigurera" för att justera nätverks inställningar ifall du är i ett land som censurerar Tor( som Egypten, Kina och Turkiet) eller ifall du ansluter från ett privat nätverk som kräver en proxy."> +<!ENTITY torSettings.configurePrompt "Klicka på "Konfigurera" för att justera nätverksinställningar om du är i ett land som censurerar Tor (som Egypten, Kina eller Turkiet) eller om du ansluter från ett privat nätverk som kräver en proxy."> <!ENTITY torSettings.configure "Konfigurera"> <!ENTITY torSettings.connect "Anslut"> @@ -26,7 +26,7 @@ <!ENTITY torsettings.optional "Valfritt"> <!ENTITY torsettings.useProxy.checkbox "Jag använder en proxy för att ansluta till internet"> -<!ENTITY torsettings.useProxy.type "Proxy-typ"> +<!ENTITY torsettings.useProxy.type "Proxytyp"> <!ENTITY torsettings.useProxy.type.placeholder "Välj en proxytyp"> <!ENTITY torsettings.useProxy.address "Adress"> <!ENTITY torsettings.useProxy.address.placeholder "IP-adress eller värdnamn"> diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd index aa31765..51e7992 100644 --- a/src/chrome/locale/vi/network-settings.dtd +++ b/src/chrome/locale/vi/network-settings.dtd @@ -64,7 +64,7 @@  <!ENTITY torPreferences.categoryTitle "Tor"> <!ENTITY torPreferences.torSettings "Cài đặt Tor"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser dẫn lưu lượng của bạn qua mạng Tor, vận hành bởi hàng ngàn tình nguyện viên khắp thế giới." > +<!ENTITY torPreferences.torSettingsDescription "Trình duyệt Tor dẫn lưu lượng của bạn qua mạng Tor, vận hành bởi hàng ngàn tình nguyện viên khắp thế giới." > <!ENTITY torPreferences.learnMore "Tìm hiểu thêm"> <!ENTITY torPreferences.bridges "Cầu Nối"> <!ENTITY torPreferences.bridgesDescription "Cầu nối giúp bạn truy cập mạng Tor ở những nơi mạng Tor bị chặn. Tùy vào vị trí của bạn mà một cầu nối có thể hoạt động tốt hơn cầu nối khác."> @@ -72,7 +72,7 @@ <!ENTITY torPreferences.requestNewBridge "Yêu cầu Cầu nối mới..."> <!ENTITY torPreferences.provideBridge "Cung cấp cầu nối"> <!ENTITY torPreferences.advanced "Nâng cao"> -<!ENTITY torPreferences.advancedDescription "Cài đặt cách Tor Browser kết nối tới internet."> +<!ENTITY torPreferences.advancedDescription "Cài đặt cách trình duyệt Tor kết nối tới internet."> <!ENTITY torPreferences.firewallPortsPlaceholder "Giá trị ngăn cách bởi dấu phẩy"> <!ENTITY torPreferences.requestBridgeDialogTitle "Yêu cầu cầu nối"> <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Đang kết nối tới BridgeDB. Vui lòng đợi.">

1 0

[tor-launcher/master] Bug 19757: Support on-disk storage of v3 client auth keys
by sysrqb＠torproject.org 21 Feb '20

21 Feb '20

commit f53497c7255b040b6c97738c3c64e98b69cc96e4 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Dec 4 09:46:54 2019 -0500 Bug 19757: Support on-disk storage of v3 client auth keys Add string for the "missing onion authentication directory" error. --- src/chrome/locale/en-US/torlauncher.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/chrome/locale/en-US/torlauncher.properties b/src/chrome/locale/en-US/torlauncher.properties index ca9774b..6ec8c40 100644 --- a/src/chrome/locale/en-US/torlauncher.properties +++ b/src/chrome/locale/en-US/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2016, The Tor Project, Inc. +### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -16,6 +16,7 @@ torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S

1 0

[tor-launcher/master] Merge remote-tracking branch 'bradetpo/bug19757-02'
by sysrqb＠torproject.org 21 Feb '20

21 Feb '20

commit bb1bff811c12fd8638ebede1514be512a9a4fbd7 Merge: cb34de3 6ceda2e Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Feb 21 21:06:02 2020 +0000 Merge remote-tracking branch 'bradetpo/bug19757-02' src/chrome/locale/en-US/torlauncher.properties | 3 ++- src/components/tl-process.js | 7 ++++++- src/modules/tl-util.jsm | 13 ++++++++++++- 3 files changed, 20 insertions(+), 3 deletions(-)

1 0

[tor-launcher/master] Release preparations for 0.2.21.2
by sysrqb＠torproject.org 21 Feb '20

21 Feb '20

commit 227d33e077e94eada351a3c6304907f8b4d8700f Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Feb 21 21:36:55 2020 +0000 Release preparations for 0.2.21.2 --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 78eef27..ac54464 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.21.1</em:version> + <em:version>0.2.21.2</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[torbutton/master] Bug 19757: Support on-disk storage of v3 client auth keys
by sysrqb＠torproject.org 21 Feb '20

21 Feb '20

commit fddbe371f2eb43d7d6007561db38d1ad8a6ff8e4 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Dec 4 09:40:34 2019 -0500 Bug 19757: Support on-disk storage of v3 client auth keys Add strings for "Remember this key" checkbox and the new "Onion Services Authentication" preferences section. --- chrome/locale/en-US/torbutton.dtd | 1 + chrome/locale/en-US/torbutton.properties | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/chrome/locale/en-US/torbutton.dtd b/chrome/locale/en-US/torbutton.dtd index ed3cb1a6..b9ae0f00 100644 --- a/chrome/locale/en-US/torbutton.dtd +++ b/chrome/locale/en-US/torbutton.dtd @@ -50,3 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> diff --git a/chrome/locale/en-US/torbutton.properties b/chrome/locale/en-US/torbutton.properties index 1020e57a..375067b3 100644 --- a/chrome/locale/en-US/torbutton.properties +++ b/chrome/locale/en-US/torbutton.properties @@ -61,6 +61,7 @@ pageInfo_OnionEncryption=Connection Encrypted (Onion Service) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.learnMore=Learn more onionServices.clientAuthMissing=Tor onion service missing client authorization onionServices.authPrompt.description=%S is requesting your private key. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service @@ -68,3 +69,14 @@ onionServices.authPrompt.done=Done onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=Key +onionServices.authPreferences.remove=Remove +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key

1 0

[torbutton/master] Translations update
by sysrqb＠torproject.org 21 Feb '20

21 Feb '20

commit 9b8d504f8db580e7a6b5b76787a713a223a9e330 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Feb 6 14:30:58 2020 +0000 Translations update --- chrome/locale/lt/browserOnboarding.properties | 2 +- chrome/locale/nb-NO/browserOnboarding.properties | 4 ++-- chrome/locale/nb-NO/torbutton.properties | 4 ++-- chrome/locale/ru/aboutTor.dtd | 10 ++++----- chrome/locale/ru/brand.dtd | 2 +- chrome/locale/ru/brand.properties | 4 ++-- chrome/locale/ru/browserOnboarding.properties | 10 ++++----- chrome/locale/ru/torbutton.dtd | 26 ++++++++++++------------ chrome/locale/ru/torbutton.properties | 4 ++-- chrome/locale/zh-CN/torbutton.properties | 6 +++--- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/chrome/locale/lt/browserOnboarding.properties b/chrome/locale/lt/browserOnboarding.properties index a53b857f..53f4d4cf 100644 --- a/chrome/locale/lt/browserOnboarding.properties +++ b/chrome/locale/lt/browserOnboarding.properties @@ -15,7 +15,7 @@ onboarding.tour-tor-privacy.button=Pereiti prie Tor tinklo onboarding.tour-tor-network=Tor tinklas onboarding.tour-tor-network.title=Keliaukite po decentralizuotą tinklą. onboarding.tour-tor-network.description=Tor Naršyklė prijungia jus prie Tor tinklo, veikiančio tūkstančių, po visą pasaulį išsidėsčiusių, savanorių dėka. Skirtingai nei VPN, čia, norint mėgautis privačiu naršymu saityne, nėra vieno žlugimo taško, ar centralizuoto objekto, kuriuo turėtumėte pasitikėti. -onboarding.tour-tor-network.description-para2=NAUJA: Tor tinklo nustatymai, įtraukiant galimybę prašyti tinklo tiltų, kur Tor užblokuotas, dabar galima rasti pirmenybėse +onboarding.tour-tor-network.description-para2=NAUJA: Dabar, Tor tinklo nustatymus (įskaitant galimybę užklausti tinklų tiltus ten, kur Tor yra blokuojamas) rasite Nuostatose. onboarding.tour-tor-network.action-button=Derinti savo Tor tinklo nustatymus onboarding.tour-tor-network.button=Pereiti į grandinės rodinį diff --git a/chrome/locale/nb-NO/browserOnboarding.properties b/chrome/locale/nb-NO/browserOnboarding.properties index a444b823..99e81620 100644 --- a/chrome/locale/nb-NO/browserOnboarding.properties +++ b/chrome/locale/nb-NO/browserOnboarding.properties @@ -49,8 +49,8 @@ onboarding.tour-tor-update.prefix-new=Ny onboarding.tour-tor-update.prefix-updated=Oppdatert onboarding.tour-tor-toolbar=Verktøylinje -onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button. -onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser. +onboarding.tour-tor-toolbar-update-9.0.title=Farvel løk-knapp. +onboarding.tour-tor-toolbar-update-9.0.description=Vi ønsker at din erfaring med å bruke Tor skal være fullt integrert i Tor Browser. onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu. onboarding.tour-tor-toolbar-update-9.0.button=Hvordan be om en Ny identitet onboarding.tour-tor-toolbar-update-9.0.next-button=Gå til Tor Nettverk diff --git a/chrome/locale/nb-NO/torbutton.properties b/chrome/locale/nb-NO/torbutton.properties index fc09dd04..1d3746c3 100644 --- a/chrome/locale/nb-NO/torbutton.properties +++ b/chrome/locale/nb-NO/torbutton.properties @@ -62,9 +62,9 @@ pageInfo_OnionEncryption=Tilkobling kryptert (Løk Tjeneste) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.clientAuthMissing=Tor onion service missing client authorization -onionServices.authPrompt.description=%S is requesting your private key. +onionServices.authPrompt.description=%S ber om din private nøkkel. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service onionServices.authPrompt.done=Ferdig onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) -onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPrompt.failedToSetKey=Kan ikke konfigurere Tor med nøkkelen din diff --git a/chrome/locale/ru/aboutTor.dtd b/chrome/locale/ru/aboutTor.dtd index c24343fa..818f7067 100644 --- a/chrome/locale/ru/aboutTor.dtd +++ b/chrome/locale/ru/aboutTor.dtd @@ -4,16 +4,16 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> -<!ENTITY aboutTor.title "О проекте Tor"> +<!ENTITY aboutTor.title "О Tor"> -<!ENTITY aboutTor.viewChangelog.label "Посмотреть список изменений"> +<!ENTITY aboutTor.viewChangelog.label "Список изменений"> <!ENTITY aboutTor.ready.label "Исследуйте. Приватно."> <!ENTITY aboutTor.ready2.label "Вы готовы к самому приватному просмотру веб-страниц в мире."> <!ENTITY aboutTor.failure.label "Что-то пошло не так!"> <!ENTITY aboutTor.failure2.label "Tor не работает в этом браузере."> -<!ENTITY aboutTor.search.label "Поиск с помощью сервиса DuckDuckGo"> +<!ENTITY aboutTor.search.label "Поиск с помощью DuckDuckGo"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Вопросы?"> @@ -26,6 +26,6 @@ <!ENTITY aboutTor.getInvolved.label "Присоединяйтесь »"> <!ENTITY aboutTor.newsletter.tagline "Получайте последние новости Tor прямо на ваш почтовый ящик."> -<!ENTITY aboutTor.newsletter.link_text "Подпишитесь на новости Tor."> -<!ENTITY aboutTor.donationBanner.line2e "Сохраните Tor сильным."> +<!ENTITY aboutTor.newsletter.link_text "Подпишитесь на новости Tor"> +<!ENTITY aboutTor.donationBanner.line2e "Поддержите Tor."> <!ENTITY aboutTor.donationBanner.buttonA "Пожертвовать"> diff --git a/chrome/locale/ru/brand.dtd b/chrome/locale/ru/brand.dtd index f4983534..35202d37 100644 --- a/chrome/locale/ru/brand.dtd +++ b/chrome/locale/ru/brand.dtd @@ -5,7 +5,7 @@ <!ENTITY brandShorterName "Tor Browser"> <!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> -<!ENTITY vendorShortName "Проект Tor"> +<!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "'Tor' и логотип 'Onion' являются зарегистрированными торговыми марками Tor Project, Inc.">  diff --git a/chrome/locale/ru/brand.properties b/chrome/locale/ru/brand.properties index 91aef011..e7a6c20c 100644 --- a/chrome/locale/ru/brand.properties +++ b/chrome/locale/ru/brand.properties @@ -2,10 +2,10 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShorterName=Обозреватель Tor +brandShorterName=Tor Browser brandShortName=Tor Browser brandFullName=Tor Browser -vendorShortName=Проект Tor +vendorShortName=Tor Project homePageSingleStartMain=Firefox Start - домашняя страничка со встроенным поиском homePageImport=Импорт вашей домашней страницы из %S diff --git a/chrome/locale/ru/browserOnboarding.properties b/chrome/locale/ru/browserOnboarding.properties index 79776b39..f07b540d 100644 --- a/chrome/locale/ru/browserOnboarding.properties +++ b/chrome/locale/ru/browserOnboarding.properties @@ -10,7 +10,7 @@ onboarding.tour-tor-welcome.next-button=Перейти к Кофиденциал onboarding.tour-tor-privacy=Приватность onboarding.tour-tor-privacy.title=Следопыты и ищейки. onboarding.tour-tor-privacy.description=Tor Browser изолирует cookies и удаляет историю просмотров после завершения сессии. Эти меры обеспечивают вашу приватность и безопасность. Нажмите «Сеть Tor», чтобы узнать, как мы защищаем вас на сетевом уровне. -onboarding.tour-tor-privacy.button=Перейти в «Сеть Tor» +onboarding.tour-tor-privacy.button=Перейти в cеть Tor onboarding.tour-tor-network=Сеть Tor onboarding.tour-tor-network.title=Перемещайтесь по децентрализованной сети. @@ -49,11 +49,11 @@ onboarding.tour-tor-update.prefix-new=Новое onboarding.tour-tor-update.prefix-updated=Обновлено onboarding.tour-tor-toolbar=Панель инструментов -onboarding.tour-tor-toolbar-update-9.0.title=Прощай, кнопка «Onion» +onboarding.tour-tor-toolbar-update-9.0.title=Прощай, кнопка "Onion" onboarding.tour-tor-toolbar-update-9.0.description=Мы хотим, чтобы ваше использование Tor было полностью интегрировано в Tor Browser. -onboarding.tour-tor-toolbar-update-9.0.description-para2=Вот почему теперь, вместо того, чтобы использовать кнопку «onion», вы можете увидеть свою цепочку Tor с помощью [i] в строке адреса и запросить новый идентификатор с помощью кнопки на панели инструментов или меню [≡]. -onboarding.tour-tor-toolbar-update-9.0.button=Как запросить новый идентификатор -onboarding.tour-tor-toolbar-update-9.0.next-button=Перейти в «Сеть Tor» +onboarding.tour-tor-toolbar-update-9.0.description-para2=Вот почему теперь вместо того, чтобы использовать кнопку "onion", вы можете увидеть свою цепочку Tor с помощью [i] в адресной строке и создать новую личность нажатием кнопки на панели инструментов или меню [≡]. +onboarding.tour-tor-toolbar-update-9.0.button=Как запросить новую личность +onboarding.tour-tor-toolbar-update-9.0.next-button=Перейти в cеть Tor # Circuit Display onboarding. onboarding.tor-circuit-display.next=Вперёд diff --git a/chrome/locale/ru/torbutton.dtd b/chrome/locale/ru/torbutton.dtd index aadcb8c8..6ab6b91e 100644 --- a/chrome/locale/ru/torbutton.dtd +++ b/chrome/locale/ru/torbutton.dtd @@ -23,30 +23,30 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Не защищать новые куки-файлы"> <!ENTITY torbutton.prefs.sec_caption "Уровень безопасности"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Ползунок безопасности позволяет вам запретить некоторые особенности обозревателя, которые могут сделать ваш браузер более уязвимым к попыткам взлома."> -<!ENTITY torbutton.prefs.sec_standard_label "Стандартные"> +<!ENTITY torbutton.prefs.sec_standard_label "Обычный"> <!ENTITY torbutton.prefs.sec_standard_description "Все функции Tor Browser и веб-сайтов включены."> -<!ENTITY torbutton.prefs.sec_safer_label "Более безопасные"> -<!ENTITY torbutton.prefs.sec_safer_description "Отключены функции веб-сайтов, которые часто бывают опасны, что может привести к потере функциональности некоторыми сайтами."> +<!ENTITY torbutton.prefs.sec_safer_label "Высокий"> +<!ENTITY torbutton.prefs.sec_safer_description "Отключены функции веб-сайтов, которые часто бывают опасны. Могут быть проблемы с работой некоторых сайтов."> <!ENTITY torbutton.prefs.sec_safer_list_label "При более безопасных настройках:"> -<!ENTITY torbutton.prefs.sec_safest_label "Наиболее безопасные"> +<!ENTITY torbutton.prefs.sec_safest_label "Высший"> <!ENTITY torbutton.prefs.sec_safest_description "Разрешены только функции веб-сайтов, требующиеся для статических сайтов и основных сервисов. Эти изменения влияют на изображения, медиа и скрипты."> <!ENTITY torbutton.prefs.sec_safest_list_label "При самых безопасных настройках:"> <!ENTITY torbutton.prefs.sec_learn_more_label "Подробнее"> -<!ENTITY torbutton.prefs.sec_js_on_https_sites_only " JavaScript отключен на всех не HTTPS сайтах. "> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript отключен на всех сайтах без HTTPS. "> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript отключен по умолчанию на всех сайтах."> -<!ENTITY torbutton.prefs.sec_limit_typography "Некоторые шрифты и математические символы отключены."> -<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Некоторые шрифты, значки, математические символы и изображения отключены."> +<!ENTITY torbutton.prefs.sec_limit_typography "Отключены некоторые шрифты и математические символы."> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Отключены некоторые шрифты, значки, математические символы и изображения."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Аудио, видео (медиа HTML5) и WebGL проигрываются при нажатии."> <!ENTITY torbutton.prefs.sec_custom_warning "Пользовательский"> -<!ENTITY torbutton.prefs.sec_overview "Отключите веб-функции, которые могут использоваться для атаки на вашу безопасность и анонимность."> -<!ENTITY torbutton.prefs.sec_standard_tooltip "Уровень безопасности : Стандартный"> -<!ENTITY torbutton.prefs.sec_safer_tooltip "Уровень безопасности : Более безопасный"> -<!ENTITY torbutton.prefs.sec_safest_tooltip "Уровень безопасности : Наиболее безопасный"> +<!ENTITY torbutton.prefs.sec_overview "Можно отключить веб-функции, которые могут использоваться для атаки на вашу безопасность и анонимность."> +<!ENTITY torbutton.prefs.sec_standard_tooltip "Уровень безопасности: обычный"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Уровень безопасности: высокий"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Уровень безопасности: высший"> <!ENTITY torbutton.prefs.sec_custom_summary "Ваши настройки браузера привели к необычным параметрам безопасности. По соображениям безопасности и приватности мы рекомендуем выбрать один из уровней безопасности по умолчанию."> <!ENTITY torbutton.prefs.sec_restore_defaults "Восстановить значения по умолчанию"> <!ENTITY torbutton.prefs.sec_advanced_security_settings "Дополнительные настройки безопасности..."> -<!ENTITY torbutton.circuit_display.title "Схема Tor"> -<!ENTITY torbutton.circuit_display.new_circuit "Новая схема для этого Сайта"> +<!ENTITY torbutton.circuit_display.title "Цепочка Tor"> +<!ENTITY torbutton.circuit_display.new_circuit "Новая цепочка для этого сайта">  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> diff --git a/chrome/locale/ru/torbutton.properties b/chrome/locale/ru/torbutton.properties index 06ab9597..a1da2002 100644 --- a/chrome/locale/ru/torbutton.properties +++ b/chrome/locale/ru/torbutton.properties @@ -29,7 +29,7 @@ torbutton.popup.short_torbrowser = Важная информация о Torbutto torbutton.popup.confirm_plugins = Плагины, такие как Flash, могут нанести вред вашей конфиденциальности и анонимности.\n\nТакже они могут обойти Tor, чтобы узнать ваше текущее местоположение и IP-адрес.\n\nВы уверены, что хотите включить плагины?\n\n torbutton.popup.never_ask_again = Больше не спрашивать -torbutton.popup.confirm_newnym = Tor Browser закроет все окна и вкладки. Все сессии сайта будут потеряны.\n\nПерезапустить Tor Browser сейчас, чтобы сбросить вашу личность?\n\n +torbutton.popup.confirm_newnym = Tor Browser закроет все окна и вкладки. Все сессии сайтов будут закрыты.\n\nПерезапустить Tor Browser, чтобы получить новую личность?\n\n torbutton.maximize_warning = Открытие Tor Browser на максимальную величину позволяет веб-сайтам определять размер вашего монитора, что может использоваться для вашего отслеживания. Мы рекомендуем оставлять окна браузера Tor в их исходном размере по умолчанию. @@ -47,7 +47,7 @@ canvas.neverAccessKey=e profileProblemTitle=Проблема с профилем %S profileReadOnly=Вы не можете запустить %S из файловой системы доступной только для чтения. Пожалуйста, скопируйте %S в другое место перед использованием. profileReadOnlyMac=Вы не можете запустить %S из файловой системы доступной только для чтения. Пожалуйста, скопируйте %S на рабочий стол или в папку Приложения перед использованием. -profileAccessDenied=У %Sне имеет прав доступа к профилю. Пожалуйста, настройте разрешения вашей файловой системы и попробуйте снова. +profileAccessDenied=У %S нет прав доступа к профилю. Пожалуйста, настройте разрешения вашей файловой системы и попробуйте снова. profileMigrationFailed=Миграция вашего существующего %S профиля не удалась.\nБудут использованы новые настройки. # "Downloading update" string for the hamburger menu (see #28885). diff --git a/chrome/locale/zh-CN/torbutton.properties b/chrome/locale/zh-CN/torbutton.properties index ca456387..72b5b373 100644 --- a/chrome/locale/zh-CN/torbutton.properties +++ b/chrome/locale/zh-CN/torbutton.properties @@ -63,8 +63,8 @@ pageInfo_OnionEncryption=连接已经被加密（洋葱服务） # LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.clientAuthMissing=Tor 洋葱服务客户端认证失败 onionServices.authPrompt.description=%S 需要您的私钥 -onionServices.authPrompt.keyPlaceholder=键入您的私人密钥来使用此洋葱服务 +onionServices.authPrompt.keyPlaceholder=输入您的私钥来使用此洋葱服务 onionServices.authPrompt.done=完成 onionServices.authPrompt.doneAccessKey=天 -onionServices.authPrompt.invalidKey=请键入一个合法的密钥（52位base32字符或44位base64字符） -onionServices.authPrompt.failedToSetKey=无法使用您的密钥来配置Tor +onionServices.authPrompt.invalidKey=请输入一个合法的密钥（52位 base32 字符或44位 base64 字符） +onionServices.authPrompt.failedToSetKey=无法使用您的密钥来配置 Tor

1 0

[torbutton/master] Translations update
by sysrqb＠torproject.org 21 Feb '20

21 Feb '20

commit 4f85cd273bffc0f8056c5a07f35e265700205af3 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Feb 21 20:58:16 2020 +0000 Translations update --- chrome/locale/sv-SE/aboutDialog.dtd | 2 +- chrome/locale/vi/browserOnboarding.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chrome/locale/sv-SE/aboutDialog.dtd b/chrome/locale/sv-SE/aboutDialog.dtd index c556fcf2..9a2c95c5 100644 --- a/chrome/locale/sv-SE/aboutDialog.dtd +++ b/chrome/locale/sv-SE/aboutDialog.dtd @@ -15,5 +15,5 @@  <!ENTITY bottomLinks.grow "Hjälp Tor-nätverket växa!">  -<!ENTITY bottomLinks.license "Licens information"> +<!ENTITY bottomLinks.license "Licensinformation"> <!ENTITY tor.TrademarkStatement "'Tor' och 'Onion-logotypen' är registerade varumärken av Tor Project, Inc."> diff --git a/chrome/locale/vi/browserOnboarding.properties b/chrome/locale/vi/browserOnboarding.properties index 0b14f935..f0c784cb 100644 --- a/chrome/locale/vi/browserOnboarding.properties +++ b/chrome/locale/vi/browserOnboarding.properties @@ -8,12 +8,12 @@ onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard onboarding.tour-tor-welcome.next-button=Go to Privacy onboarding.tour-tor-privacy=Riêng tư -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. +onboarding.tour-tor-privacy.title=Chống theo dõi, rình mò. onboarding.tour-tor-privacy.description=Trình duyệt Tor cô lập cookies và xoá lịch sử duyệt web của bạn sau mỗi phiên. Những thay đổi này đảm bảo quyền riêng tư của bạn được bảo vệ trong trình duyệt. Nhân 'Tor Network' để tìm hiểu cách chúng tôi bảo vệ bạn trên cấp độ mạng. onboarding.tour-tor-privacy.button=Đi đến mạng Tor onboarding.tour-tor-network=Mạng Tor -onboarding.tour-tor-network.title=Travel a decentralized network. +onboarding.tour-tor-network.title=Di chuyển trên mạng lưới phi tập trung. onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings

1 0

[torbutton/master] Merge remote-tracking branch 'bradetpo/bug19757-02'
by sysrqb＠torproject.org 21 Feb '20

21 Feb '20

commit 078ae18e5f1cbf888e7c86c8aecaa383a727bf0d Merge: 4f85cd27 dc187160 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Feb 21 21:04:00 2020 +0000 Merge remote-tracking branch 'bradetpo/bug19757-02' chrome/locale/en-US/torbutton.dtd | 1 + chrome/locale/en-US/torbutton.properties | 12 +++++++++++ modules/tor-control-port.js | 36 ++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+)

1 0

[torbutton/master] Bug 19757: Support on-disk storage of v3 client auth keys
by sysrqb＠torproject.org 21 Feb '20

21 Feb '20

commit dc1871601fad289645696bb8138e8b14c46dd60a Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jan 15 08:24:27 2020 -0500 Bug 19757: Support on-disk storage of v3 client auth keys Add onionAuthViewKeys() and onionAuthRemove() Tor controller functions. --- modules/tor-control-port.js | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/modules/tor-control-port.js b/modules/tor-control-port.js index 815df473..2b0849e9 100644 --- a/modules/tor-control-port.js +++ b/modules/tor-control-port.js @@ -580,6 +580,26 @@ info.getConf = function (aControlSocket, key) { // A namespace for functions related to tor's ONION_CLIENT_AUTH_* commands. let onionAuth = {}; +onionAuth.keyInfoStringsFromMessage = utils.extractor(/^250-CLIENT\s+(.+)$/gmi); + +onionAuth.keyInfoObjectsFromMessage = function(message) { + let keyInfoStrings = onionAuth.keyInfoStringsFromMessage(message); + return keyInfoStrings.map(infoStr => utils.listMapData(infoStr, + ["hsAddress", "typeAndKey"])); +} + +// __onionAuth.viewKeys()__. +// Sends a ONION_CLIENT_AUTH_VIEW command to retrieve the list of private keys. +// Returns a promise that is fulfilled with an array of key info objects which +// contain the following properties: +// hsAddress +// typeAndKey +// Flags (e.g., "Permanent") +onionAuth.viewKeys = function (aControlSocket) { + let cmd = "onion_client_auth_view"; + return aControlSocket.sendCommand(cmd).then(onionAuth.keyInfoObjectsFromMessage); +}; + // __onionAuth.add(controlSocket, hsAddress, b64PrivateKey, isPermanent)__. // Sends a ONION_CLIENT_AUTH_ADD command to add a private key to the // Tor configuration. @@ -600,6 +620,19 @@ onionAuth.add = function (aControlSocket, hsAddress, b64PrivateKey, return aControlSocket.sendCommand(cmd); }; +// __onionAuth.remove(controlSocket, hsAddress)__. +// Sends a ONION_CLIENT_AUTH_REMOVE command to remove a private key from the +// Tor configuration. +onionAuth.remove = function (aControlSocket, hsAddress) { + if (!utils.isString(hsAddress)) { + return utils.rejectPromise("hsAddress argument should be a string"); + } + + let cmd = `onion_client_auth_remove ${hsAddress}`; + return aControlSocket.sendCommand(cmd); +}; + + // ## event // Handlers for events @@ -655,9 +688,12 @@ tor.controller = function (ipcFile, host, port, password, onError) { isOpen = true; return { getInfo : key => info.getInfo(socket, key), getConf : key => info.getConf(socket, key), + onionAuthViewKeys : () => onionAuth.viewKeys(socket), onionAuthAdd : (hsAddress, b64PrivateKey, isPermanent) => onionAuth.add(socket, hsAddress, b64PrivateKey, isPermanent), + onionAuthRemove : (hsAddress) => + onionAuth.remove(socket, hsAddress), watchEvent : (type, filter, onData) => event.watchEvent(socket, type, filter, onData), isOpen : () => isOpen,

1 0

[tor-browser-build/master] Merge remote-tracking branch 'sisbellgh/bug-31130i'
by sysrqb＠torproject.org 20 Feb '20

20 Feb '20

commit 3f341196fba76654999faa42139c5fa46882b527 Merge: ffc6f84 1961708 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Feb 20 21:24:55 2020 +0000 Merge remote-tracking branch 'sisbellgh/bug-31130i' projects/debootstrap-image/config | 17 +++++++++-------- projects/firefox/build | 1 + projects/firefox/config | 5 ----- projects/https-everywhere/config | 1 + projects/tor-android-service/config | 6 ------ projects/tor-browser/build.android | 2 +- projects/tor-browser/config | 1 - projects/tor-onion-proxy-library/config | 6 ------ rbm.conf | 13 ++++++++++++- 9 files changed, 24 insertions(+), 28 deletions(-)

1 0

[tor-browser-build/master] Bug 31130: Use Debian 10 for our Android container images
by sysrqb＠torproject.org 20 Feb '20

20 Feb '20

commit 196170812a1c8c0c3f05bf298aaefca8cde277e3 Author: sisbell <shane.isbell(a)gmail.com> Date: Tue Oct 22 10:21:32 2019 -0700 Bug 31130: Use Debian 10 for our Android container images --- projects/debootstrap-image/config | 17 +++++++++-------- projects/firefox/build | 1 + projects/firefox/config | 5 ----- projects/https-everywhere/config | 1 + projects/tor-android-service/config | 6 ------ projects/tor-browser/build.android | 2 +- projects/tor-browser/config | 1 - projects/tor-onion-proxy-library/config | 6 ------ rbm.conf | 13 ++++++++++++- 9 files changed, 24 insertions(+), 28 deletions(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index a50cbf1..f7b9e57 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -4,7 +4,7 @@ version: 2 pkg_type: build var: - ubuntu_version: 18.04.1 + ubuntu_version: 19.10 container: use_container: 1 @@ -15,8 +15,6 @@ pre: | #!/bin/sh set -e export DEBIAN_FRONTEND=noninteractive - # Bug 29158: install fixed packages for apt vulnerability (CVE-2019-3462) - dpkg -i ./apt_1.6.6ubuntu0.1_amd64.deb ./libapt-pkg5.0_1.6.6ubuntu0.1_amd64.deb apt-get update -y -q apt-get install -y -q debian-archive-keyring ubuntu-keyring debootstrap debootstrap --arch=[% c("var/container/arch") %] [% c("var/container/debootstrap_opt") %] [% c("var/container/suite") %] base-image [% c("var/container/debootstrap_mirror") %] @@ -65,14 +63,17 @@ targets: suite: stretch arch: amd64 + buster-amd64: + var: + minimal_apt_version: 1.8.2 + container: + suite: buster + arch: amd64 + input_files: - URL: 'http://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' - sha256sum: ed76e649f65548a80b361b68011085ec4dde7bb762d667657acbef87765e1a12 - - URL: http://security.ubuntu.com/ubuntu/pool/main/a/apt/apt_1.6.6ubuntu0.1_amd64.… - sha256sum: df210f9e30cf9deba5fbe815203af854e5e77bdbbe0b96d0d1c0da46a6a8dd0a - - URL: http://security.ubuntu.com/ubuntu/pool/main/a/apt/libapt-pkg5.0_1.6.6ubuntu… - sha256sum: 0a05a97b1e9b8d52ee8df040a14c5fabdebbb2c2235ac495db29df34f4c8cec3 + sha256sum: eedcb1dc0ccc86b59eb1f89960c322a2ba3ed3e0323a20a1da8bcc0e6f100f4f - URL: '[% c("var/apt_packages_baseurl") %]/[% c("var/apt_package_filename") %]' sha256sum: '[% c("var/apt_package_sha256sum") %]' enable: '[% c("var/apt_package_filename") %]' diff --git a/projects/firefox/build b/projects/firefox/build index c334854..800a0c4 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -57,6 +57,7 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig [% END -%] [% IF c("var/android") %] + export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64 gradle_repo=/var/tmp/dist/gradle-dependencies export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo" export GRADLE_FLAGS="--no-daemon --offline" diff --git a/projects/firefox/config b/projects/firefox/config index d9b9edb..45a33a0 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -54,11 +54,6 @@ targets: var: branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/nightly' - android: - var: - arch_deps: - - openjdk-8-jdk - linux: var: post_pkginst: | diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 1bc6f98..c66d7fe 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -27,6 +27,7 @@ var: - rsync - zip - unzip + pre_pkginst: '' input_files: - project: container-image diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index ca68d7b..c2994b7 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -13,12 +13,6 @@ var: # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 3 -targets: - android: - var: - arch_deps: - - openjdk-8-jdk - input_files: - project: container-image - name: '[% c("var/compiler") %]' diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index f8f3a8d..751db11 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -55,4 +55,4 @@ cd tmp }) %] # Sign a QA build. This apk is not a debug version and doesn't contain a debug flag in the manifest -java -jar /usr/share/apksigner/apksigner.jar sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $qa_apk --in $apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android +java -jar /usr/lib/android-sdk/build-tools/debian/apksigner.jar sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $qa_apk --in $apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 7fd61a9..eaacff7 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -46,7 +46,6 @@ targets: build: '[% INCLUDE build.android %]' var: arch_deps: - - openjdk-8-jdk - apksigner input_files: diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index d76949d..c682078 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -15,12 +15,6 @@ var: # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 3 -targets: - android: - var: - arch_deps: - - openjdk-8-jdk - input_files: - project: container-image - name: '[% c("var/compiler") %]' diff --git a/rbm.conf b/rbm.conf index 32da3c6..f5f35c1 100644 --- a/rbm.conf +++ b/rbm.conf @@ -236,7 +236,7 @@ targets: CC: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang' CXX: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang++' container: - suite: stretch + suite: buster arch: amd64 deps: - build-essential @@ -245,7 +245,18 @@ targets: - libtool - zip - unzip + - libtinfo5 + pre_pkginst: | + SNAPSHOT_VERSION=20191201T212855Z + OPENJDK_URL=https://snapshot.debian.org/archive/debian/$SNAPSHOT_VERSION/po… + JDK_VERSION=8u232-b09-1~deb9u1_amd64 + apt-get install -y -q wget ca-certificates-java + wget $OPENJDK_URL/openjdk-8-jdk-headless_$JDK_VERSION.deb + wget $OPENJDK_URL/openjdk-8-jre-headless_$JDK_VERSION.deb + echo 92b4f8fb77d793a86e0b03b3b0750592b40a26a5d75956d10dd984a7b3aad4c9 openjdk-8-jdk-headless_$JDK_VERSION.deb | sha256sum -c + echo 84bf52b6cce20ead08b0d5b9fd9b81b4aa3da385ca951b313fe11d5cb1aa4d17 openjdk-8-jre-headless_$JDK_VERSION.deb | sha256sum -c + dpkg -i ./openjdk-8-jre-headless_$JDK_VERSION.deb ./openjdk-8-jdk-headless_$JDK_VERSION.deb torbrowser-linux-x86_64: - linux-x86_64 - linux

1 0

[tor-browser/tor-browser-68.5.0esr-9.5-1] Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT
by sysrqb＠torproject.org 19 Feb '20

19 Feb '20

commit 6046d1d582804594a57d132280376b8027d1ed83 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jan 30 14:32:13 2020 +0100 Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT --- browser/moz.configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/moz.configure b/browser/moz.configure index f0f0f07e23f3..f03184d48651 100644 --- a/browser/moz.configure +++ b/browser/moz.configure @@ -5,7 +5,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. imply_option('MOZ_PLACES', True) -imply_option('MOZ_SERVICES_HEALTHREPORT', True) +imply_option('MOZ_SERVICES_HEALTHREPORT', False) imply_option('MOZ_SERVICES_SYNC', True) imply_option('MOZ_DEDICATED_PROFILES', False) imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', False)

1 0

[tor-browser/tor-browser-68.5.0esr-9.5-1] Bug 32658: Create a new MAR signing key
by sysrqb＠torproject.org 19 Feb '20

19 Feb '20

commit 0f42a8ed2229c1ad5da15803eeebd2f849ffdb21 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 17 12:54:31 2020 +0000 Bug 32658: Create a new MAR signing key It's time for our rotation again: Move the backup key in the front position and add a new backup key. --- toolkit/mozapps/update/updater/release_primary.der | Bin 1229 -> 1229 bytes toolkit/mozapps/update/updater/release_secondary.der | Bin 1229 -> 1229 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/toolkit/mozapps/update/updater/release_primary.der b/toolkit/mozapps/update/updater/release_primary.der index ec74f89dc807..0103a171de88 100644 Binary files a/toolkit/mozapps/update/updater/release_primary.der and b/toolkit/mozapps/update/updater/release_primary.der differ diff --git a/toolkit/mozapps/update/updater/release_secondary.der b/toolkit/mozapps/update/updater/release_secondary.der index 0103a171de88..fcee3944e9b7 100644 Binary files a/toolkit/mozapps/update/updater/release_secondary.der and b/toolkit/mozapps/update/updater/release_secondary.der differ

1 0

[tor-browser-build/master] Bug 33283: Pick up RBM caching logic
by sysrqb＠torproject.org 19 Feb '20

19 Feb '20

commit ffc6f844dbbf1985f5d10bd8dab2b15d9c8c2e75 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Feb 19 17:50:41 2020 +0000 Bug 33283: Pick up RBM caching logic --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 94fce31..e4f12ab 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 94fce31e54d3fd491cdb3e3b9401919c0e841360 +Subproject commit e4f12abe9ed81050994b5345c21b988005259396

1 0

[rbm/master] Bug 33283: Add caching for the exec template function
by sysrqb＠torproject.org 19 Feb '20

19 Feb '20

commit ce6b9136fc9e006536b34844946d67aa92cc0c21 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 12 11:16:22 2020 +0100 Bug 33283: Add caching for the exec template function --- lib/RBM.pm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 4db951a..f419c24 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -475,10 +475,14 @@ sub run_script { sub execute { my ($project, $cmd, $options) = @_; + CORE::state %cache; + my $res_name; my $old_cwd = getcwd; if (project_config($project, 'git_url', $options)) { my $git_hash = project_config($project, 'git_hash', $options) || exit_error "No git_hash specified for project $project"; + $res_name = "git-$git_hash-$cmd"; + return $cache{$res_name} if exists $cache{$res_name}; git_clone_fetch_chdir($project, $options); my ($stdout, $stderr, $success, $exit_code) = capture_exec('git', 'checkout', $git_hash); @@ -494,6 +498,8 @@ sub execute { } elsif (project_config($project, 'hg_url', $options)) { my $hg_hash = project_config($project, 'hg_hash', $options) || exit_error "No hg_hash specified for project $project"; + $res_name = "hg-$hg_hash-$cmd"; + return $cache{$res_name} if exists $cache{$res_name}; hg_clone_fetch_chdir($project, $options); my ($stdout, $stderr, $success, $exit_code) = capture_exec('hg', 'update', '-C', $hg_hash); @@ -503,7 +509,8 @@ sub execute { = run_script($project, $cmd, \&capture_exec); chdir($old_cwd); chomp $stdout; - return $success ? $stdout : undef; + $cache{$res_name} = $success ? $stdout : undef; + return $cache{$res_name}; } sub gpg_id {

1 0

[rbm/master] Bug 33283: Avoid computing sha256sum of files multiple times
by sysrqb＠torproject.org 19 Feb '20

19 Feb '20

commit e4f12abe9ed81050994b5345c21b988005259396 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 12 16:09:00 2020 +0100 Bug 33283: Avoid computing sha256sum of files multiple times Instead, use the sha256file functon, which keeps the sha256sum of files to avoid computing it twice. The function can now take a HASH as a second argument, which can contain the key remove_cache indicating that the sha256sum of a file should be cleared: we use this when we find that a file has the wrong checksum and needs to be downloaded again. --- lib/RBM.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index f419c24..375648f 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -610,6 +610,11 @@ sub maketar { sub sha256file { CORE::state %res; my $f = rbm_path(shift); + my $opt = shift; + if (ref $opt eq 'HASH' && $opt->{remove_cache}) { + delete $res{$f}; + return; + } return $res{$f} if exists $res{$f}; return $res{$f} = -f $f ? sha256_hex(path($f)->slurp_raw) : ''; } @@ -724,7 +729,8 @@ sub input_file_need_dl { return undef if $action eq 'getfpaths'; if ($fname && $input_file->{sha256sum} - && $t->('sha256sum') ne sha256_hex(path($fname)->slurp_raw)) { + && $t->('sha256sum') ne sha256file($fname)) { + sha256file($fname, { remove_cache => 1 }); $fname = undef; } if ($action eq 'input_files_id') { @@ -928,7 +934,7 @@ sub input_files { } exit_error "Missing file $name" unless $fname; if ($t->('sha256sum') - && $t->('sha256sum') ne sha256_hex(path($fname)->slurp_raw)) { + && $t->('sha256sum') ne sha256file($fname)) { exit_error "Can't have sha256sum on directory: $fname" if -d $fname; exit_error "Wrong sha256sum for $fname.\n" . "Expected sha256sum: " . $t->('sha256sum');

1 0

[tor-browser-build/master] Bug 33380: Add *.json to sha256sums-unsigned-build.txt
by sysrqb＠torproject.org 19 Feb '20

19 Feb '20

commit 19497b09ae5f68768a1d2690249b51b6fca89b41 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 19 12:51:44 2020 +0100 Bug 33380: Add *.json to sha256sums-unsigned-build.txt --- projects/release/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/build b/projects/release/build index c1badd6..c859828 100644 --- a/projects/release/build +++ b/projects/release/build @@ -46,7 +46,7 @@ RewriteRule ^sha256sums.txt.asc$ sha256sums-unsigned-build.txt.asc RewriteRule ^sha256sums.incrementals.txt$ sha256sums-unsigned-build.incrementals.txt RewriteRule ^sha256sums.incrementals.txt.asc$ sha256sums-unsigned-build.incrementals.txt.asc EOF -sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz *.apk | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt +sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz *.apk *.json | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt [% IF c("var/sign_build") -%] gpg -abs [% c("var/sign_build_gpg_opts") %] sha256sums-unsigned-build.txt [% END -%]

1 0

[tor-browser-build/master] Small typos in 9.5a5 changelog
by sysrqb＠torproject.org 14 Feb '20

14 Feb '20

commit 0e2585be3ab2a4dc5b533c87d8745b0bf4a75bc4 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Feb 14 16:28:35 2020 +0000 Small typos in 9.5a5 changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 16acbbf..72bb219 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -14,11 +14,11 @@ Tor Browser 9.5a5 -- February 12 2020 * Android * Bug 30767: Custom obfs4 bridge does not work on Tor Browser for Android * Windows + OS X + Linux - * Update Tor to 0.4.3.1-alpha + * Update Tor to 0.4.3.2-alpha * Update Tor Launcher to 0.2.21.1 * Translations update * Bug 30237: Add v3 onion services client authentication prompt - * Bug 32870: Update version of pion-webrtc + * Bug 32870: Update version of pion-webrtc * Bug 32767: Remove Disconnect search * Bug 30237: Add v3 onion services client authentication prompt * Build System

1 0

[tor-browser-build/master] Pick up tor-browser -build2
by sysrqb＠torproject.org 12 Feb '20

12 Feb '20

commit c27a4f73c2a221baddc4d68c63f21adce595fb12 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Feb 12 01:51:27 2020 +0000 Pick up tor-browser -build2 --- projects/firefox/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 845f9c6..d9b9edb 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 32b0575..32da3c6 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.5a5' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.5a4 project_name: tor-browser

1 0

[tor-browser/tor-browser-68.5.0esr-9.5-1] Revert "Bug 1603270 - Add telemetry for FirefoxPromoBannerRow user actions. r=VladBaicu, a=RyanVM"
by sysrqb＠torproject.org 11 Feb '20

11 Feb '20

commit c2da27fca068dac7658fe53f51124908ee8c723b Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue Feb 11 20:41:06 2020 +0000 Revert "Bug 1603270 - Add telemetry for FirefoxPromoBannerRow user actions. r=VladBaicu, a=RyanVM" This reverts commit 334f572f8b2113c464bd65e1282b7085a1dfb5eb. --- mobile/android/base/java/org/mozilla/gecko/Telemetry.java | 9 --------- mobile/android/base/java/org/mozilla/gecko/mma/MmaDelegate.java | 2 -- 2 files changed, 11 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/Telemetry.java b/mobile/android/base/java/org/mozilla/gecko/Telemetry.java index 4da174d18bb9..20a50a0bd34b 100644 --- a/mobile/android/base/java/org/mozilla/gecko/Telemetry.java +++ b/mobile/android/base/java/org/mozilla/gecko/Telemetry.java @@ -5,7 +5,6 @@ package org.mozilla.gecko; -import org.mozilla.gecko.activitystream.homepanel.stream.FirefoxPromoBannerRow; import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.annotation.WrapForJNI; import org.mozilla.gecko.TelemetryContract.Event; @@ -16,10 +15,8 @@ import org.mozilla.gecko.mma.MmaDelegate; import android.util.Log; -import static org.mozilla.gecko.mma.MmaDelegate.DISMISSED_FIREFOX_PROMO_BANNER; import static org.mozilla.gecko.mma.MmaDelegate.INTERACT_WITH_SEARCH_URL_AREA; import static org.mozilla.gecko.mma.MmaDelegate.OPENED_BOOKMARK; -import static org.mozilla.gecko.mma.MmaDelegate.OPENED_FIREFOX_PROMO_BANNER; import static org.mozilla.gecko.mma.MmaDelegate.SAVED_BOOKMARK; import static org.mozilla.gecko.mma.MmaDelegate.SAVED_LOGIN_AND_PASSWORD; import static org.mozilla.gecko.mma.MmaDelegate.SCREENSHOT; @@ -111,12 +108,6 @@ public class Telemetry { MmaDelegate.track(SAVED_LOGIN_AND_PASSWORD); } else if (eventName.equalsIgnoreCase(Event.ACTION.toString()) && method == Method.BUTTON && extras.equals("awesomescreen-signup-dismiss")) { MmaDelegate.track(SIGN_UP_DISMISS); - } else if (eventName.equalsIgnoreCase(Event.ACTION.toString()) && method == Method.BUTTON && - extras.equals(FirefoxPromoBannerRow.FIREFOX_PROMO_OPEN_EVENT)) { - MmaDelegate.track(OPENED_FIREFOX_PROMO_BANNER); - } else if (eventName.equalsIgnoreCase(Event.ACTION.toString()) && method == Method.BUTTON && - extras.equals(FirefoxPromoBannerRow.FIREFOX_PROMO_DISMISS_EVENT)) { - MmaDelegate.track(DISMISSED_FIREFOX_PROMO_BANNER); } } } diff --git a/mobile/android/base/java/org/mozilla/gecko/mma/MmaDelegate.java b/mobile/android/base/java/org/mozilla/gecko/mma/MmaDelegate.java index f4a3e926afc3..68a36a65026c 100644 --- a/mobile/android/base/java/org/mozilla/gecko/mma/MmaDelegate.java +++ b/mobile/android/base/java/org/mozilla/gecko/mma/MmaDelegate.java @@ -55,8 +55,6 @@ public class MmaDelegate { public static final String ONBOARDING_DEFAULT_VALUES = "E_Onboarding_With_Default_Values"; public static final String ONBOARDING_REMOTE_VALUES = "E_Onboarding_With_Remote_Values"; public static final String SIGN_UP_DISMISS = "E_Signup_Dismiss"; - public static final String OPENED_FIREFOX_PROMO_BANNER = "E_Opened_Firefox_Promo"; - public static final String DISMISSED_FIREFOX_PROMO_BANNER = "E_Dismissed_Firefox_Promo"; public static final String USER_SIGNED_IN_TO_FXA = "E_User_Signed_In_To_FxA"; public static final String USER_SIGNED_UP_FOR_FXA = "E_User_Signed_Up_For_FxA";

1 0

[tor-browser-build/master] Bug 30767: Support custom PT bridges on Android
by sysrqb＠torproject.org 11 Feb '20

11 Feb '20

commit 3ce57ded27baa63dfff074e9a10a62365dc3bc25 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Feb 7 02:18:21 2020 +0000 Bug 30767: Support custom PT bridges on Android --- ...ustom-obfs4-bridge-does-not-work-on-Tor-B.patch | 146 +++++++++++++++++++++ projects/tor-onion-proxy-library/build | 1 + projects/tor-onion-proxy-library/config | 1 + 3 files changed, 148 insertions(+) diff --git a/projects/tor-onion-proxy-library/0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch b/projects/tor-onion-proxy-library/0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch new file mode 100644 index 0000000..2d1bc51 --- /dev/null +++ b/projects/tor-onion-proxy-library/0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch @@ -0,0 +1,146 @@ +From 0a482a749fd770827d3d6c71debb112a07e7fae3 Mon Sep 17 00:00:00 2001 +From: sisbell <shane.isbell(a)gmail.com> +Date: Thu, 14 Nov 2019 13:43:09 -0800 +Subject: [PATCH] Bug 30767: Custom obfs4 bridge does not work on Tor Browser + for Android + +TOPL fixes #134 +--- + .../thali/toronionproxy/TorConfigBuilder.java | 63 ++++++++----------- + 1 file changed, 26 insertions(+), 37 deletions(-) + +diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +index e324d9f..da9a6a2 100644 +--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java ++++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +@@ -99,25 +99,32 @@ public final class TorConfigBuilder { + return this; + } + ++ @SettingsConfig ++ public TorConfigBuilder bridgesFromSettings() { ++ try { ++ addBridgesFromResources(); ++ } catch (IOException e) { ++ e.printStackTrace(); ++ } ++ return this; ++ } ++ + public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportClient) throws IOException { +- List<String> supportedBridges = settings.getListOfSupportedBridges(); +- if (pluggableTransportClient == null || !settings.hasBridges() || supportedBridges.size() < 1) { ++ if (pluggableTransportClient == null) { + return this; + } + +- if (!pluggableTransportClient.exists() || !pluggableTransportClient.canExecute()) { ++ if (!pluggableTransportClient.exists()) { + throw new IOException("Bridge binary does not exist: " + pluggableTransportClient + .getCanonicalPath()); + } + +- if (supportedBridges.contains("obfs3") || supportedBridges.contains("obfs4")) { +- transportPluginObfs(pluggableTransportClient.getCanonicalPath()); +- } +- if (supportedBridges.contains("meek")) { +- transportPluginMeek(pluggableTransportClient.getCanonicalPath()); ++ if (!pluggableTransportClient.canExecute()) { ++ throw new IOException("Bridge binary is not executable: " + pluggableTransportClient ++ .getCanonicalPath()); + } +- String type = supportedBridges.contains("meek") ? "meek_lite" : "obfs4"; +- addBridgesFromResources(type, 2); ++ ++ transportPlugin(pluggableTransportClient.getCanonicalPath()); + return this; + } + +@@ -471,14 +478,8 @@ public final class TorConfigBuilder { + return transPort(settings.transPort()); + } + +- public TorConfigBuilder transportPluginMeek(String clientPath) { +- buffer.append("ClientTransportPlugin meek_lite exec ").append(clientPath).append('\n'); +- return this; +- } +- +- public TorConfigBuilder transportPluginObfs(String clientPath) { +- buffer.append("ClientTransportPlugin obfs3 exec ").append(clientPath).append('\n'); +- buffer.append("ClientTransportPlugin obfs4 exec ").append(clientPath).append('\n'); ++ public TorConfigBuilder transportPlugin(String clientPath) { ++ buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(clientPath).append('\n'); + return this; + } + +@@ -489,7 +490,7 @@ public final class TorConfigBuilder { + + @SettingsConfig + public TorConfigBuilder useBridgesFromSettings() { +- return !settings.hasBridges() ? dontUseBridges() : this; ++ return settings.hasBridges() ? useBridges() : this; + } + + public TorConfigBuilder virtualAddressNetwork(String address) { +@@ -518,12 +519,12 @@ public final class TorConfigBuilder { + * </code> + * + */ +- TorConfigBuilder addBridgesFromResources(String type, int maxBridges) throws IOException { ++ TorConfigBuilder addBridgesFromResources() throws IOException { + if(settings.hasBridges()) { + InputStream bridgesStream = context.getInstaller().openBridgesStream(); + int formatType = bridgesStream.read(); +- if(formatType == 0) { +- addBridges(bridgesStream, type, maxBridges); ++ if (formatType == 0) { ++ addBridges(bridgesStream); + } else { + addCustomBridges(bridgesStream); + } +@@ -534,23 +535,14 @@ public final class TorConfigBuilder { + /** + * Add bridges from bridges.txt file. + */ +- private void addBridges(InputStream input, String bridgeType, int maxBridges) { +- if (input == null || isNullOrEmpty(bridgeType) || maxBridges < 1) { ++ private void addBridges(InputStream input) { ++ if (input == null) { + return; + } +- boolean hasAddedBridge = false; + List<Bridge> bridges = readBridgesFromStream(input); +- Collections.shuffle(bridges, new Random(System.nanoTime())); +- int bridgeCount = 0; + for (Bridge b : bridges) { +- if (b.type.equals(bridgeType)) { +- bridge(b.type, b.config); +- hasAddedBridge = true; +- if (++bridgeCount > maxBridges) +- break; +- } ++ bridge(b.type, b.config); + } +- if(hasAddedBridge) useBridges(); + } + + /** +@@ -560,15 +552,12 @@ public final class TorConfigBuilder { + if (input == null) { + return; + } +- boolean hasAddedBridge = false; + List<Bridge> bridges = readCustomBridgesFromStream(input); + for (Bridge b : bridges) { + if (b.type.equals("custom")) { + bridgeCustom(b.config); +- hasAddedBridge = true; + } + } +- if(hasAddedBridge) useBridges(); + } + + private static List<Bridge> readBridgesFromStream(InputStream input) { +-- +2.20.1 + diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index 0f2d976..9a8b31e 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -21,6 +21,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] # build will pull down the correct android tool versions patch -p1 < $rootdir/gradle.patch patch -p1 < $rootdir/canceldormant.patch +patch -p1 < $rootdir/0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch # Extract obfs4proxy from TorBrowser/Tor/PluggableTransports/obfs4proxy tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/obfs4') %] diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index ff3432c..d76949d 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -32,3 +32,4 @@ input_files: exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - filename: gradle.patch - filename: canceldormant.patch + - filename: 0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch

1 0

[tor-browser-build/master] Release preparations for 9.5a5
by sysrqb＠torproject.org 11 Feb '20

11 Feb '20

commit d3059ceb6288874b682076a5bf4aa1dff76511cd Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Feb 10 01:16:23 2020 +0000 Release preparations for 9.5a5 Versions bump and Changelog update --- projects/firefox-langpacks/config | 2 +- projects/firefox-locale-bundle/config | 2 +- projects/firefox/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 29 ++++++++++++++++++++++ projects/tor-browser/config | 4 +-- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- rbm.conf | 6 ++--- 8 files changed, 39 insertions(+), 10 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 34d6fad..17a707a 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets: diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config index 2f4997f..2ea6db6 100644 --- a/projects/firefox-locale-bundle/config +++ b/projects/firefox-locale-bundle/config @@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: use_container: 0 ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 diff --git a/projects/firefox/config b/projects/firefox/config index f780084..845f9c6 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.4.1 + firefox_platform_version: 68.5.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 9.5 branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index ad3cc9d..16acbbf 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,32 @@ +Tor Browser 9.5a5 -- February 12 2020 + * All Platforms + * Update Firefox to 68.5.0esr + * Bump NoScript to 11.0.13 + * Translations update + * Bug 30237: Control port module improvements for v3 client authentication + * Bug 32891: Add new default bridges + * Bug 31395: Remove inline script in aboutTor.xhtml + * Bug 27268: Preferences clean-up in Torbutton code + * Bug 32470: Backport fix for bug 1590538 + * Bug 32414: Make Services.search.addEngine obey FPI + * Bug 32948: Make referer behavior consistent regardless of private browing mode status + * Bug 461204: Improve the random number generator for the boundaries in multipart/form-data + * Android + * Bug 30767: Custom obfs4 bridge does not work on Tor Browser for Android + * Windows + OS X + Linux + * Update Tor to 0.4.3.1-alpha + * Update Tor Launcher to 0.2.21.1 + * Translations update + * Bug 30237: Add v3 onion services client authentication prompt + * Bug 32870: Update version of pion-webrtc + * Bug 32767: Remove Disconnect search + * Bug 30237: Add v3 onion services client authentication prompt + * Build System + * Linux + * Bug 32976: Build and bundle geckodriver + * OS X + * Bug 33200: Fix permissions on bookmarks.html + Tor Browser 9.5a4 -- January 10 2020 * All Platforms * Update Firefox to 68.4.1esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index d3e8e61..7fd61a9 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -74,9 +74,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 1b0daa12e1b8fbc8e30e7bdb5689b12774aaa9f883cb3e9ad57943a883ce65b5 + sha256sum: ced718d9d9e719547db392ad85d24a7ad5c6b54cc0f93f9c57f2fcb44bb4de56 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 874ad15..fec0612 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.21 +version: 0.2.21.1 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index c1c41a6..9b5ba3d 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.4.3.1-alpha +version: 0.4.3.2-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 77c6e4a..32b0575 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.5a4' - torbrowser_build: 'build2' + torbrowser_version: '9.5a5' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.5a3 + - 9.5a4 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Bug 33200: Fix permissions on bookmarks.html
by sysrqb＠torproject.org 11 Feb '20

11 Feb '20

commit 241e805dbbefcb0860bf32a38b63fcd7edf71a68 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Feb 9 23:50:01 2020 +0100 Bug 33200: Fix permissions on bookmarks.html Fix a build reproducibility issue caused by different permissions on bookmarks.html. --- projects/tor-browser/build | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 2633ddc..b9732e8 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -170,6 +170,7 @@ cp defaults/preferences/000-tor-browser.js $rootdir mkdir -p chrome/en-US/locale/browser cp -p $rootdir/bookmarks.html chrome/en-US/locale/browser/ [% c("var/touch") %] chrome/en-US/locale/browser/bookmarks.html + chmod 600 chrome/en-US/locale/browser/bookmarks.html zip -Xm omni.ja chrome/en-US/locale/browser/bookmarks.html rm -rf chrome [% END %]

1 0

[tor-browser-build/maint-9.0] Changelog update and build3
by sysrqb＠torproject.org 10 Feb '20

10 Feb '20

commit af17fda1a457cf3ec5845318556defd0d29272d7 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Feb 10 02:31:45 2020 +0000 Changelog update and build3 Fix reproducibility issue in macOS build. --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 ++ rbm.conf | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index c576cdf..c542ef0 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -12,6 +12,8 @@ Tor Browser 9.0.5 -- February 11 2020 * Build System * All Platforms * Bug 32739: Bump clang to 8.0.1 + * OS X + * Bug 33200: Fix permissions on bookmarks.html Tor Browser 9.0.4 -- January 9 2020 * All Platforms diff --git a/rbm.conf b/rbm.conf index 5e43719..123d1a8 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0.5' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 9.0.4 project_name: tor-browser

1 0

[tor-browser-build/maint-9.0] Bug 33200: Fix permissions on bookmarks.html
by sysrqb＠torproject.org 10 Feb '20

10 Feb '20

commit 16c72c7040e51364f497ec2ed8a597b6874d080d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Feb 9 23:50:01 2020 +0100 Bug 33200: Fix permissions on bookmarks.html Fix a build reproducibility issue caused by different permissions on bookmarks.html. --- projects/tor-browser/build | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index cf31331..bcd2412 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -147,6 +147,7 @@ cp defaults/preferences/000-tor-browser.js $rootdir mkdir -p chrome/en-US/locale/browser cp -p $rootdir/bookmarks.html chrome/en-US/locale/browser/ [% c("var/touch") %] chrome/en-US/locale/browser/bookmarks.html + chmod 600 chrome/en-US/locale/browser/bookmarks.html zip -Xm omni.ja chrome/en-US/locale/browser/bookmarks.html rm -rf chrome [% END %]

1 0

[tor-launcher/master] Translations update
by sysrqb＠torproject.org 07 Feb '20

07 Feb '20

commit dc0898ee7a84678ef324e08d29f5722e8c83572a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Feb 6 23:37:23 2020 +0000 Translations update --- src/chrome/locale/ja/network-settings.dtd | 2 +- src/chrome/locale/ka/network-settings.dtd | 2 +- src/chrome/locale/nb-NO/network-settings.dtd | 6 +- src/chrome/locale/nl/torlauncher.properties | 2 +- src/chrome/locale/pt-PT/network-settings.dtd | 6 +- src/chrome/locale/pt-PT/torlauncher.properties | 2 +- src/chrome/locale/ru/network-settings.dtd | 18 ++--- src/chrome/locale/vi/network-settings.dtd | 42 +++++----- src/chrome/locale/vi/torlauncher.properties | 106 ++++++++++++------------- src/chrome/locale/zh-CN/network-settings.dtd | 14 ++-- 10 files changed, 100 insertions(+), 100 deletions(-) diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd index 2d2dce7..f52bf18 100644 --- a/src/chrome/locale/ja/network-settings.dtd +++ b/src/chrome/locale/ja/network-settings.dtd @@ -66,7 +66,7 @@ <!ENTITY torPreferences.torSettings "Tor の設定"> <!ENTITY torPreferences.torSettingsDescription "Tor Browser は通信トラフィックを Tor ネットワークを経由させて送信します。Tor ネットワークは世界中の何千ものボランティアによって運用されています。" > <!ENTITY torPreferences.learnMore "詳細情報"> -<!ENTITY torPreferences.bridges "ブリッジ"> +<!ENTITY torPreferences.bridges "Bridge"> <!ENTITY torPreferences.bridgesDescription "ブリッジは Tor がブロックされる地域から Tor ネットワークにアクセスすることを手助けします。地域によって、あるブリッジが他のものよりうまく動作する可能性があります。"> <!ENTITY torPreferences.useBridge "ブリッジを使用する"> <!ENTITY torPreferences.requestNewBridge "新しいブリッジを要求…"> diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd index 82ae5ad..737e74f 100644 --- a/src/chrome/locale/ka/network-settings.dtd +++ b/src/chrome/locale/ka/network-settings.dtd @@ -79,5 +79,5 @@ <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "გაიარეთ CAPTCHA, გადამცემი ხიდის მოთხოვნისთვის."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "გადაწყვეტა არასწორია. გთხოვთ სცადოთ ხელახლა."> <!ENTITY torPreferences.viewTorLogs "იხილეთ Tor-ის ჩანაწერები."> -<!ENTITY torPreferences.viewLogs "იხილეთ ჩანაწერები..."> +<!ENTITY torPreferences.viewLogs "ჩანაწერების ნახვა..."> <!ENTITY torPreferences.torLogsDialogTitle "Tor-ის ჩანაწერები"> diff --git a/src/chrome/locale/nb-NO/network-settings.dtd b/src/chrome/locale/nb-NO/network-settings.dtd index 2254760..f2e0547 100644 --- a/src/chrome/locale/nb-NO/network-settings.dtd +++ b/src/chrome/locale/nb-NO/network-settings.dtd @@ -28,7 +28,7 @@ <!ENTITY torsettings.useProxy.checkbox "Jeg bruker en mellomtjener for å koble til Internett"> <!ENTITY torsettings.useProxy.type "Mellomtjeningstype"> <!ENTITY torsettings.useProxy.type.placeholder "velg en mellomtjenertype"> -<!ENTITY torsettings.useProxy.address "Address"> +<!ENTITY torsettings.useProxy.address " Adresse"> <!ENTITY torsettings.useProxy.address.placeholder "IP-adresse, eller vertsnavn"> <!ENTITY torsettings.useProxy.port "Port"> <!ENTITY torsettings.useProxy.username "Brukernavn"> @@ -72,10 +72,10 @@ <!ENTITY torPreferences.requestNewBridge "Forespør ny bro…"> <!ENTITY torPreferences.provideBridge "Provide a bridge"> <!ENTITY torPreferences.advanced "Avansert"> -<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> +<!ENTITY torPreferences.advancedDescription "Konfigurer hvordan Tor Browser kobles til internett."> <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> <!ENTITY torPreferences.requestBridgeDialogTitle "Forespør en bro"> -<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontakter BridgeDB. Vennligst vent."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Løs CAPTCHA-en for å forespørre en bro."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "Løsningen er ikke riktig. Vær så snill, prøv på nytt."> <!ENTITY torPreferences.viewTorLogs "Se Tor-loggene."> diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties index c5c7518..e77ca7b 100644 --- a/src/chrome/locale/nl/torlauncher.properties +++ b/src/chrome/locale/nl/torlauncher.properties @@ -29,7 +29,7 @@ torlauncher.error_default_bridges_type_missing=U moet een transporttype selecter torlauncher.error_bridgedb_bridges_missing=Vraag een bridge aan. torlauncher.error_bridge_bad_default_type=Er zijn geen verstrekte bridges met het transporttype %S beschikbaar. Pas uw instellingen aan. -torlauncher.bridge_suffix.meek-amazon=(Werkt in China) +torlauncher.bridge_suffix.meek-amazon=(werkt in China) torlauncher.bridge_suffix.meek-azure=(werkt in China) torlauncher.request_a_bridge=Een bridge aanvragen… diff --git a/src/chrome/locale/pt-PT/network-settings.dtd b/src/chrome/locale/pt-PT/network-settings.dtd index c67eda7..529ee3e 100644 --- a/src/chrome/locale/pt-PT/network-settings.dtd +++ b/src/chrome/locale/pt-PT/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Opcional"> <!ENTITY torsettings.useProxy.checkbox "Eu utilizo um proxy para ligar à Internet"> -<!ENTITY torsettings.useProxy.type "Tipo de proxy"> +<!ENTITY torsettings.useProxy.type "Tipo de Proxy"> <!ENTITY torsettings.useProxy.type.placeholder "selecionar um tipo de proxy"> <!ENTITY torsettings.useProxy.address "Morada"> <!ENTITY torsettings.useProxy.address.placeholder "Endereço de IP ou nome do hospedeiro"> <!ENTITY torsettings.useProxy.port "Porta"> -<!ENTITY torsettings.useProxy.username "nome de utilizador"> +<!ENTITY torsettings.useProxy.username "Nome de utilizador"> <!ENTITY torsettings.useProxy.password "Palavra-passe"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Este computador liga através de uma firewall que só permite ligações para determinadas portas"> -<!ENTITY torsettings.firewall.allowedPorts "Portas permitidas"> +<!ENTITY torsettings.firewall.allowedPorts "Portas Permitidas"> <!ENTITY torsettings.useBridges.checkbox "O Tor é censurado no meu país"> <!ENTITY torsettings.useBridges.default "Selecionar uma ponte integrada"> <!ENTITY torsettings.useBridges.default.placeholder "selecionar uma ponte"> diff --git a/src/chrome/locale/pt-PT/torlauncher.properties b/src/chrome/locale/pt-PT/torlauncher.properties index 36e225e..459dfbc 100644 --- a/src/chrome/locale/pt-PT/torlauncher.properties +++ b/src/chrome/locale/pt-PT/torlauncher.properties @@ -15,7 +15,7 @@ torlauncher.tor_bootstrap_failed_details=%1$S falhou (%2$S). torlauncher.unable_to_start_tor=Não é possível iniciar o Tor.\n\n %S torlauncher.tor_missing=O executável do Tor está em falta. torlauncher.torrc_missing=O ficheiro torrc está em falta e não foi possível criá-lo. -torlauncher.datadir_missing=O diretório de dados do Tor não existe e não foi possível criá-lo. +torlauncher.datadir_missing=A diretoria de dados do Tor não existe e não foi possível criá-la. torlauncher.password_hash_missing=Não foi possível obter a palavra-passe "hashed". torlauncher.failed_to_get_settings=Não é possível obter as definições do Tor\n\n %S diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd index 5e950b0..03e4f61 100644 --- a/src/chrome/locale/ru/network-settings.dtd +++ b/src/chrome/locale/ru/network-settings.dtd @@ -36,8 +36,8 @@ <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "Мой сетевой экран позволяет мне подключиться только к определённым портам"> -<!ENTITY torsettings.firewall.allowedPorts "Разрешённые порты"> +<!ENTITY torsettings.firewall.checkbox "Мой брандмауэр разрешает подключения только к определенным портам"> +<!ENTITY torsettings.firewall.allowedPorts "Разрешенные порты"> <!ENTITY torsettings.useBridges.checkbox "Tor запрещён в моей стране"> <!ENTITY torsettings.useBridges.default "Выбрать встроенный мост"> <!ENTITY torsettings.useBridges.default.placeholder "выбор моста"> @@ -47,7 +47,7 @@ <!ENTITY torsettings.useBridges.captchaSubmit "Передать"> <!ENTITY torsettings.useBridges.custom "Указать мост, который я знаю"> <!ENTITY torsettings.useBridges.label "Введите информацию о мосте от доверенного источника."> -<!ENTITY torsettings.useBridges.placeholder "введите адрес:порт (по одному в строке)"> +<!ENTITY torsettings.useBridges.placeholder "адрес:порт (по одному в строке)"> <!ENTITY torsettings.copyLog "Скопировать журнал Tor в буфер обмена"> @@ -64,13 +64,13 @@  <!ENTITY torPreferences.categoryTitle "Tor"> <!ENTITY torPreferences.torSettings "Настройки Tor"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser перенаправляет ваш трафик через сеть Tor, управляемую тысячами добровольцев по всему миру." > +<!ENTITY torPreferences.torSettingsDescription "Tor Browser перенаправляет ваш трафик через сеть Tor. Ее поддерживают тысячи добровольцев по всему миру." > <!ENTITY torPreferences.learnMore "Подробнее"> <!ENTITY torPreferences.bridges "Мосты"> -<!ENTITY torPreferences.bridgesDescription "Мосты помогают получить доступ к сети Tor в местах, где он заблокирован. В зависимости от места, где вы находитесь, один мост может работать лучше другого."> +<!ENTITY torPreferences.bridgesDescription "Мосты помогают получить доступ к сети Tor там, где он заблокирован. В зависимости от вашего местонахождения один мост может работать лучше другого."> <!ENTITY torPreferences.useBridge "Использовать мост"> <!ENTITY torPreferences.requestNewBridge "Запрос нового моста…"> -<!ENTITY torPreferences.provideBridge "Предоставить мост"> +<!ENTITY torPreferences.provideBridge "Указать свой мост"> <!ENTITY torPreferences.advanced "Дополнительно"> <!ENTITY torPreferences.advancedDescription "Настройка подключения Tor Browser к интернету."> <!ENTITY torPreferences.firewallPortsPlaceholder "Значения, разделённые запятыми"> @@ -78,6 +78,6 @@ <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Обращение к BridgeDB. Пожалуйста, подождите."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Решите CAPTCHA для запроса моста."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "Решение не является правильным. Попробуйте ещё раз."> -<!ENTITY torPreferences.viewTorLogs "Просмотр журналов Tor."> -<!ENTITY torPreferences.viewLogs "Просмотр журналов…"> -<!ENTITY torPreferences.torLogsDialogTitle "Журналы Tor"> +<!ENTITY torPreferences.viewTorLogs "Просмотр журнала Tor"> +<!ENTITY torPreferences.viewLogs "Просмотр журнала…"> +<!ENTITY torPreferences.torLogsDialogTitle "Журнал Tor"> diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd index 9ecc5d9..aa31765 100644 --- a/src/chrome/locale/vi/network-settings.dtd +++ b/src/chrome/locale/vi/network-settings.dtd @@ -26,7 +26,7 @@ <!ENTITY torsettings.optional "Tuỳ chọn"> <!ENTITY torsettings.useProxy.checkbox "Tôi sử dụng proxy để kết nối tới Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type"> +<!ENTITY torsettings.useProxy.type "Loại proxy"> <!ENTITY torsettings.useProxy.type.placeholder "chọn loại proxy"> <!ENTITY torsettings.useProxy.address "Địa chỉ nhà"> <!ENTITY torsettings.useProxy.address.placeholder "Địa chỉ IP hoặc hostname"> @@ -37,7 +37,7 @@ <!ENTITY torsettings.useProxy.type.socks5 "SOCK 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Máy tính này đi qua một tường lửa mà chỉ cho phép tới một vài cổng"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "Cổng được cho phép"> <!ENTITY torsettings.useBridges.checkbox "Tor đã bị kiểm duyệt ở quốc gia của tôi"> <!ENTITY torsettings.useBridges.default "Sử dụng cầu nối có sẵn"> <!ENTITY torsettings.useBridges.default.placeholder "chọn loại cầu nối"> @@ -52,32 +52,32 @@ <!ENTITY torsettings.copyLog "Chép nhật ký của Tor vào Clipboard"> <!ENTITY torsettings.proxyHelpTitle "Trợ giúp proxy"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> +<!ENTITY torsettings.proxyHelp1 "Proxy cục bộ có thể cần thiết khi kết nối qua mạng ở công ty hay trường học. Nếu bạn không chắc rằng có cần dùng proxy hay không, xem cài đặt Internet ở một trình duyệt khác hoặc kiểm tra cài đặt Internet của hệ thống."> <!ENTITY torsettings.bridgeHelpTitle "Giúp đỡ về Tiếp sức cầu nối"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Cầu nối là những rơle không công khai giúp kết nối tới mạng Tor khó bị chặn hơn.  Mỗi loại cầu nối sử dụng một phương thức khác nhau để tránh kiểm duyệt.  Cầu nối obfs khiến lưu lượng của bạn trông như ngẫu nhiên, còn cầu nối meek khiến lưu lượng của bạn trông như đang kết nối tới dịch vụ đó thay vì Tor."> +<!ENTITY torsettings.bridgeHelp2 "Vì một vài quốc gia chặn Tor theo những cách khác nhau, cầu nối này có thể hoạt động ở quốc gia này nhưng không được ở quốc gia khác.  Nếu bạn không chắc cầu nối nào hoạt động ở quốc gia bạn, hãy truy cập torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Vui lòng chờ trong khi chúng tôi thiết lập kết nối tới mạng lưới Tor.  Việc này có thể mất một vài phút.">  <!ENTITY torPreferences.categoryTitle "Tor"> -<!ENTITY torPreferences.torSettings "Tor Settings"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > -<!ENTITY torPreferences.learnMore "Learn More"> +<!ENTITY torPreferences.torSettings "Cài đặt Tor"> +<!ENTITY torPreferences.torSettingsDescription "Tor Browser dẫn lưu lượng của bạn qua mạng Tor, vận hành bởi hàng ngàn tình nguyện viên khắp thế giới." > +<!ENTITY torPreferences.learnMore "Tìm hiểu thêm"> <!ENTITY torPreferences.bridges "Cầu Nối"> -<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> -<!ENTITY torPreferences.useBridge "Use a bridge"> -<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> -<!ENTITY torPreferences.provideBridge "Provide a bridge"> +<!ENTITY torPreferences.bridgesDescription "Cầu nối giúp bạn truy cập mạng Tor ở những nơi mạng Tor bị chặn. Tùy vào vị trí của bạn mà một cầu nối có thể hoạt động tốt hơn cầu nối khác."> +<!ENTITY torPreferences.useBridge "Dùng cầu nối"> +<!ENTITY torPreferences.requestNewBridge "Yêu cầu Cầu nối mới..."> +<!ENTITY torPreferences.provideBridge "Cung cấp cầu nối"> <!ENTITY torPreferences.advanced "Nâng cao"> -<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> -<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> -<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> -<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> -<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> +<!ENTITY torPreferences.advancedDescription "Cài đặt cách Tor Browser kết nối tới internet."> +<!ENTITY torPreferences.firewallPortsPlaceholder "Giá trị ngăn cách bởi dấu phẩy"> +<!ENTITY torPreferences.requestBridgeDialogTitle "Yêu cầu cầu nối"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Đang kết nối tới BridgeDB. Vui lòng đợi."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Giải mã CAPTCHA để yêu cầu cầu nối."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Kết quả không đúng. Vui lòng thử lại."> +<!ENTITY torPreferences.viewTorLogs "Xem nhật kí Tor."> +<!ENTITY torPreferences.viewLogs "Xem nhật kí..."> +<!ENTITY torPreferences.torLogsDialogTitle "Nhật kí Tor"> diff --git a/src/chrome/locale/vi/torlauncher.properties b/src/chrome/locale/vi/torlauncher.properties index f2e19d1..cb6ed17 100644 --- a/src/chrome/locale/vi/torlauncher.properties +++ b/src/chrome/locale/vi/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=Trình khởi chạy Tor -torlauncher.tor_exited_during_startup=Tor đã thoát trong khi khởi động. Điều này có lẽ là do một lỗi trong tệp tin torrc của bạn, một khiếm khuyết của Tor hay của một chương trình khác trong hệ thống của bạn, hoặc lỗi phần cứng. Cho đến khi bạn sửa chữa lại vấn đề bên dưới đó và khởi động lại Tor, trình duyệt Tor sẽ không khởi động. +torlauncher.tor_exited_during_startup=Tor đã thoát trong khi khởi động. Điều này có lẽ là do lỗi trong tập tin torrc của bạn, lỗi của Tor hay một chương trình khác trong hệ thống của bạn, hoặc lỗi phần cứng. Cho đến khi bạn sửa chữa lại vấn đề đó và khởi động lại Tor, trình duyệt Tor sẽ không khởi động. torlauncher.tor_exited=Tor đã tắt một cách không mong muốn. Việc này có thể do lỗi trong bản thân Tor, một chương trình khác trong hệ thống của bản, hoặc lỗi phần cứng. Cho tới khi bạn khởi động lại Tor, Trình duyệt Tor sẽ không thể truy cập tới bất kỳ trang nào. Nếu vấn đề vẫn tồn tại, vui lòng gửi một bản sao nhật ký của Tor tới nhóm hỗ trợ. torlauncher.tor_exited2=Khởi động lại Tor sẽ không đóng hết những thẻ trình duyệt của bạn. torlauncher.tor_controlconn_failed=Không thể kết nối với cổng kiểm soát của Tor. @@ -14,7 +14,7 @@ torlauncher.tor_bootstrap_failed_details=%1$S đã thất bại (%2$S). torlauncher.unable_to_start_tor=Không thể khởi động Tor.\n\n%S torlauncher.tor_missing=Tập tin thực thi của Tor bị thiếu. -torlauncher.torrc_missing=Tập tin torrc đang bị thiếu hoặc không thể tạo. +torlauncher.torrc_missing=Tập tin torrc đang bị thiếu và không thể tạo. torlauncher.datadir_missing=Thư mục dữ liệu của Tor không tồn tại và không thể tạo. torlauncher.password_hash_missing=Thất bại khi lấy mật khẩu đã được băm. @@ -22,73 +22,73 @@ torlauncher.failed_to_get_settings=Không thể nhận được cài đặt Tor. torlauncher.failed_to_save_settings=Không thể lưu lại các cài đặt của Tor. torlauncher.ensure_tor_is_running=Hãy chắc chắn rằng Tor đang chạy. -torlauncher.error_proxy_addr_missing=Bạn phải xác định cả hai một địa chỉ IP hay tên máy và số cổng để cấu hình Tor để sử dụng một proxy ủy quyền truy cập vào Liên mạng +torlauncher.error_proxy_addr_missing=Bạn phải xác định cả địa chỉ IP hoặc hostname và số cổng để cấu hình Tor sử dụng một proxy để truy cập Internet. torlauncher.error_proxy_type_missing=Bạn phải chọn kiểu proxy. -torlauncher.error_bridges_missing=Bạn phải chỉ dẫn một hoặc nhiều cầu nối. -torlauncher.error_default_bridges_type_missing=Bạn phải chọn một loại vận chuyển cho cầu nối đã được cung cấp. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridges_missing=Bạn phải chọn một hoặc nhiều cầu nối. +torlauncher.error_default_bridges_type_missing=Bạn phải chọn một hình thức vận chuyển cho cầu nối đã được cung cấp. +torlauncher.error_bridgedb_bridges_missing=Vui lòng yêu cầu cầu nối torlauncher.error_bridge_bad_default_type=Không cầu nối đã được cung cấp nào có loại vận chuyển %S có sẵn. Vui lòng điều chỉnh cài đặt của bạn. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(hoạt động ở Trung Quốc) +torlauncher.bridge_suffix.meek-azure=(hoạt động ở Trung Quốc) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S +torlauncher.request_a_bridge=Yêu cầu Cầu nối... +torlauncher.request_a_new_bridge=Yêu cầu Cầu nối mới... +torlauncher.contacting_bridgedb=Đang kết nối tới BridgeDB. Vui lòng đợi. +torlauncher.captcha_prompt=Giải mã CAPTCHA để yêu cầu cầu nối. +torlauncher.bad_captcha_solution=Kết quả không đúng. Vui lòng thử lại. +torlauncher.unable_to_get_bridge=Không thể nhận cầu nối từ BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.no_bridges_available=Không có cầu nối khả dụng lúc này. Xin lỗi. torlauncher.connect=Kết nối torlauncher.restart_tor=Khởi động lại Tor torlauncher.quit=Thoát torlauncher.quit_win=Thoát -torlauncher.done=Hoàn thành +torlauncher.done=Xong torlauncher.forAssistance=Để được trợ giúp, liên hệ %S torlauncher.forAssistance2=Nếu cần sự giúp đỡ, ghé qua %S -torlauncher.copiedNLogMessages=Sao chép hoàn tất. %S thông điệp nhật ký của Tor đã sẵn sàng để dán vào một chương trình sửa văn bản hoặc một thông điệp email. +torlauncher.copiedNLogMessages=Sao chép hoàn tất. %S thông điệp nhật ký của Tor đã sẵn sàng để dán vào một chương trình sửa văn bản hoặc một email. -torlauncher.bootstrapStatus.starting=Bắt đầu -torlauncher.bootstrapStatus.conn_pt=Connecting to bridge -torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge -torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy -torlauncher.bootstrapStatus.conn_done_proxy=Connected to proxy -torlauncher.bootstrapStatus.conn=Connecting to a Tor relay -torlauncher.bootstrapStatus.conn_done=Connected to a Tor relay -torlauncher.bootstrapStatus.handshake=Negotiating with a Tor relay -torlauncher.bootstrapStatus.handshake_done=Finished negotiating with a Tor relay -torlauncher.bootstrapStatus.onehop_create=Thành lập một kết nối thư mục được mã hóa -torlauncher.bootstrapStatus.requesting_status=Khôi phục trạng thái mạng -torlauncher.bootstrapStatus.loading_status=Nap tình trạng mạng -torlauncher.bootstrapStatus.loading_keys=Nạp giấy chứng nhận quyền -torlauncher.bootstrapStatus.requesting_descriptors=Yêu cầu thông tin tiếp sức -torlauncher.bootstrapStatus.loading_descriptors=Tải thông tin tiếp sức -torlauncher.bootstrapStatus.enough_dirinfo=Finished loading relay information -torlauncher.bootstrapStatus.ap_conn_pt=Building circuits: Connecting to bridge -torlauncher.bootstrapStatus.ap_conn_done_pt=Building circuits: Connected to bridge -torlauncher.bootstrapStatus.ap_conn_proxy=Building circuits: Connecting to proxy -torlauncher.bootstrapStatus.ap_conn_done_proxy=Building circuits: Connected to proxy -torlauncher.bootstrapStatus.ap_conn=Building circuits: Connecting to a Tor relay -torlauncher.bootstrapStatus.ap_conn_done=Building circuits: Connected to a Tor relay -torlauncher.bootstrapStatus.ap_handshake=Building circuits: Negotiating with a Tor relay -torlauncher.bootstrapStatus.ap_handshake_done=Building circuits: Finished negotiating with a Tor relay -torlauncher.bootstrapStatus.circuit_create=Building circuits: Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Kết nối với mạng Tor! +torlauncher.bootstrapStatus.starting=Đang khởi động +torlauncher.bootstrapStatus.conn_pt=Đang kết nối tới cầu nối +torlauncher.bootstrapStatus.conn_done_pt=Đã kết nối tới cầu nối +torlauncher.bootstrapStatus.conn_proxy=Đang kết nối tới proxy +torlauncher.bootstrapStatus.conn_done_proxy=Đã kết nối tới proxy +torlauncher.bootstrapStatus.conn=Đang kết nối tới một rơle Tor +torlauncher.bootstrapStatus.conn_done=Đã kết nối tới một rơle Tor +torlauncher.bootstrapStatus.handshake=Đang đàm phán với một rơle Tor +torlauncher.bootstrapStatus.handshake_done=Đã đàm phán với một rơle Tor +torlauncher.bootstrapStatus.onehop_create=Đang thiết lập một kết nối danh mục được mã hóa +torlauncher.bootstrapStatus.requesting_status=Đang nhận trạng thái mạng +torlauncher.bootstrapStatus.loading_status=Đang tải trạng thái mạng +torlauncher.bootstrapStatus.loading_keys=Đang tải chứng nhận quyền +torlauncher.bootstrapStatus.requesting_descriptors=Đang yêu cầu thông tin rơle +torlauncher.bootstrapStatus.loading_descriptors=Đang tải thông tin rơle +torlauncher.bootstrapStatus.enough_dirinfo=Đã tải thông tin rơle +torlauncher.bootstrapStatus.ap_conn_pt=Đang xây dựng mạch: Đang kết nối tới cầu nối +torlauncher.bootstrapStatus.ap_conn_done_pt=Đang xây dựng mạch: Đã kết nối tới cầu nối +torlauncher.bootstrapStatus.ap_conn_proxy=Đang xây dựng mạch: Đang kết nối tới proxy +torlauncher.bootstrapStatus.ap_conn_done_proxy=Đang xây dựng mạch: Đã kết nối tới proxy +torlauncher.bootstrapStatus.ap_conn=Đang xây dựng mạch: Đang kết nối tới một rơle Tor +torlauncher.bootstrapStatus.ap_conn_done=Đang xây dựng mạch: Đã kết nối tới một rơle Tor +torlauncher.bootstrapStatus.ap_handshake=Đang xây dựng mạch: Đang đàm phán với một rơle Tor +torlauncher.bootstrapStatus.ap_handshake_done=Đang xây dựng mạch: Đã đàm phán với một rơle Tor +torlauncher.bootstrapStatus.circuit_create=Đang xây dựng mạch: Đang thiết lập mạch Tor +torlauncher.bootstrapStatus.done=Đã kết nối tới mạng Tor! -torlauncher.bootstrapWarning.done=làm xong -torlauncher.bootstrapWarning.connectrefused=kết nối từ chối -torlauncher.bootstrapWarning.misc=hỗn hợp -torlauncher.bootstrapWarning.resourcelimit=không đủ nguồn lực +torlauncher.bootstrapWarning.done=xong +torlauncher.bootstrapWarning.connectrefused=kết nối đã bị từ chối +torlauncher.bootstrapWarning.misc=bổ sung +torlauncher.bootstrapWarning.resourcelimit=không đủ tài nguyên torlauncher.bootstrapWarning.identity=danh tính không khớp -torlauncher.bootstrapWarning.timeout=kết nối timeout -torlauncher.bootstrapWarning.noroute=không có lộ trình để lưu trữ +torlauncher.bootstrapWarning.timeout=kết nối đã timeout +torlauncher.bootstrapWarning.noroute=không có lộ trình đến máy chủ torlauncher.bootstrapWarning.ioerror=lỗi đọc / ghi -torlauncher.bootstrapWarning.pt_missing=pluggable transport bị mất +torlauncher.bootstrapWarning.pt_missing=thiếu pluggable transport -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Mất kết nối tới máy chủ. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Không thể kết nối tới máy chủ. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Không thể kết nối tới proxy. diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index 8c9bc74..53500ef 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -1,5 +1,5 @@ <!ENTITY torsettings.dialog.title "Tor 网络设置"> -<!ENTITY torsettings.wizard.title.default "已连接到 Tor 网络"> +<!ENTITY torsettings.wizard.title.default "连接 Tor 网络"> <!ENTITY torsettings.wizard.title.configure "Tor 网络设置"> <!ENTITY torsettings.wizard.title.connecting "正在建立连接"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "请点击“连接”以连接至 Tor 网络。"> -<!ENTITY torSettings.configurePrompt "如果您所在的国家（如埃及，中国，土耳其）对 Tor 进行审查，或者您处于的私人网络需要代理，请点击“配置”，对网络设置进行调整。"> +<!ENTITY torSettings.connectPrompt "点击“连接”，连接 Tor 网络。"> +<!ENTITY torSettings.configurePrompt "如您所在国家（如埃及、中国、土耳其）对 Tor 进行审查，或者您的私人网络需要代理，请点击“配置”，调整网络设置。"> <!ENTITY torSettings.configure "配置"> <!ENTITY torSettings.connect "连接"> @@ -41,15 +41,15 @@ <!ENTITY torsettings.useBridges.checkbox "我所在的国家对 Tor 进行了审查"> <!ENTITY torsettings.useBridges.default "选择内置网桥"> <!ENTITY torsettings.useBridges.default.placeholder "选择网桥"> -<!ENTITY torsettings.useBridges.bridgeDB "从torproject.org获取一个网桥"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "请输入图片中出现的字符"> +<!ENTITY torsettings.useBridges.bridgeDB "从 torproject.org 获取网桥"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "请输入图中的字符"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "获取新的验证码"> <!ENTITY torsettings.useBridges.captchaSubmit "提交"> -<!ENTITY torsettings.useBridges.custom "输入获取的网桥"> +<!ENTITY torsettings.useBridges.custom "输入已获取网桥"> <!ENTITY torsettings.useBridges.label "输入可信来源提供的网桥："> <!ENTITY torsettings.useBridges.placeholder "输入地址:端口（每行一个）"> -<!ENTITY torsettings.copyLog "点击复制 Tor 日志"> +<!ENTITY torsettings.copyLog "复制 Tor 日志"> <!ENTITY torsettings.proxyHelpTitle "代理帮助"> <!ENTITY torsettings.proxyHelp1 "通过公司，学校或大学的网络连接时可能需要本地代理。  如果您不确定是否需要代理，可查看其他浏览器中的网络设置或查看系统的网络设置。">

1 0

[tor-launcher/master] Release preparations for 0.2.21.1
by sysrqb＠torproject.org 07 Feb '20

07 Feb '20

commit 3a38a607d4a5aabc8be29f9d57fa074cacc4c006 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Feb 7 03:02:41 2020 +0000 Release preparations for 0.2.21.1 Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index fb35c37..78eef27 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.21</em:version> + <em:version>0.2.21.1</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-browser-build/maint-9.0] Bump clang to 8.0.1
by sysrqb＠torproject.org 06 Feb '20

06 Feb '20

commit 76da9f6b962bf9a76f2d367ebfe315c3effe835e Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 12 16:47:15 2019 +0000 Bump clang to 8.0.1 --- keyring/clang.gpg | Bin 7186 -> 2222 bytes keyring/llvm.gpg | Bin 4309 -> 0 bytes projects/clang/config | 14 +++++++------- projects/mingw-w64-clang/config | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/keyring/clang.gpg b/keyring/clang.gpg index 15f0d8a..eba625c 100644 Binary files a/keyring/clang.gpg and b/keyring/clang.gpg differ diff --git a/keyring/llvm.gpg b/keyring/llvm.gpg deleted file mode 100644 index 7c7ab06..0000000 Binary files a/keyring/llvm.gpg and /dev/null differ diff --git a/projects/clang/config b/projects/clang/config index 59a9102..cf4dcb0 100644 --- a/projects/clang/config +++ b/projects/clang/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 8.0.0 +version: 8.0.1 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' gpg_keyring: clang.gpg sig_ext: sig @@ -23,22 +23,22 @@ input_files: enable: '[% c("var/linux") %]' - project: cmake name: cmake - - URL: 'https://releases.llvm.org/[% c("version") %]/llvm-[% c("version") %].src.tar.xz' + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/llvm-[% c("version") %].src.tar.xz' name: llvm file_gpg_id: 1 - - URL: 'https://releases.llvm.org/[% c("version") %]/cfe-[% c("version") %].src.tar.xz' + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/cfe-[% c("version") %].src.tar.xz' name: cfe file_gpg_id: 1 - - URL: 'https://releases.llvm.org/[% c("version") %]/libcxx-[% c("version") %].src.tar.xz' + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/libcxx-[% c("version") %].src.tar.xz' name: libcxx file_gpg_id: 1 - - URL: 'https://releases.llvm.org/[% c("version") %]/libcxxabi-[% c("version") %].src.tar.xz' + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/libcxxabi-[% c("version") %].src.tar.xz' name: libcxxabi file_gpg_id: 1 - - URL: 'https://releases.llvm.org/[% c("version") %]/lld-[% c("version") %].src.tar.xz' + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/lld-[% c("version") %].src.tar.xz' name: lld file_gpg_id: 1 - - URL: 'https://releases.llvm.org/[% c("version") %]/compiler-rt-[% c("version") %].src.tar.xz' + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/compiler-rt-[% c("version") %].src.tar.xz' name: compiler-rt file_gpg_id: 1 - filename: win-patches diff --git a/projects/mingw-w64-clang/config b/projects/mingw-w64-clang/config index 32d18a8..11480b9 100644 --- a/projects/mingw-w64-clang/config +++ b/projects/mingw-w64-clang/config @@ -3,7 +3,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64 git_hash: 0a1d495478d8ed1a94fc77b9dbb428b7e0372588 version: '[% c("abbrev") %]' -llvm_version: 8.0.0 +llvm_version: 8.0.1 gpg_keyring: clang.gpg sig_ext: sig @@ -21,16 +21,16 @@ input_files: name: clang - project: cmake name: cmake - - URL: 'https://releases.llvm.org/[% c("llvm_version") %]/libcxx-[% c("llvm_version") %].src.tar.xz' + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("llvm_version") %]/libcxx-[% c("llvm_version") %].src.tar.xz' name: libcxx file_gpg_id: 1 - - URL: 'https://releases.llvm.org/[% c("llvm_version") %]/libcxxabi-[% c("llvm_version") %].src.tar.xz' + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("llvm_version") %]/libcxxabi-[% c("llvm_version") %].src.tar.xz' name: libcxxabi file_gpg_id: 1 - - URL: 'https://releases.llvm.org/[% c("llvm_version") %]/libunwind-[% c("llvm_version") %].src.tar.xz' + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("llvm_version") %]/libunwind-[% c("llvm_version") %].src.tar.xz' name: libunwind file_gpg_id: 1 - - URL: 'https://releases.llvm.org/[% c("llvm_version") %]/compiler-rt-[% c("llvm_version") %].src.tar.xz' + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("llvm_version") %]/compiler-rt-[% c("llvm_version") %].src.tar.xz' name: compiler-rt file_gpg_id: 1 - project: llvm-mingw

1 0

[tor-browser-build/maint-9.0] Changelog update and build2
by sysrqb＠torproject.org 06 Feb '20

06 Feb '20

commit b334967863adbacfb05ebddc3933da6edcbb51c0 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Feb 6 16:59:48 2020 +0000 Changelog update and build2 --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 3 +++ rbm.conf | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index ccb9ec8..87010ee 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 9ad5b4f..c576cdf 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -9,6 +9,9 @@ Tor Browser 9.0.5 -- February 11 2020 * Bump Tor to 0.4.2.6 * Windows * Bug 32132: Re-enable jemalloc for Windows users + * Build System + * All Platforms + * Bug 32739: Bump clang to 8.0.1 Tor Browser 9.0.4 -- January 9 2020 * All Platforms diff --git a/rbm.conf b/rbm.conf index c394689..5e43719 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0.5' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.0.4 project_name: tor-browser

1 0

[tor-browser-build/maint-9.0] Release preparations for 9.0.5
by sysrqb＠torproject.org 06 Feb '20

06 Feb '20

commit 06470dd9dc737547d43b1e15b96b441b0601add4 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Feb 6 14:28:17 2020 +0000 Release preparations for 9.0.5 Versions bump and Changelog update --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 12 ++++++++++++ projects/tor-browser/config | 4 ++-- projects/tor/config | 2 +- rbm.conf | 5 ++--- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index f50af8c..ccb9ec8 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.4.1 + firefox_platform_version: 68.5.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 9.0 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 78dd726..9ad5b4f 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,15 @@ +Tor Browser 9.0.5 -- February 11 2020 + * All Platforms + * Update Firefox to 68.5.0esr + * Bump NoScript to 11.0.13 + * Bug 32053: Fix LLVM reproducibility issues + * Bug 32255: Missing ORIGIN header breaks CORS + * Bug 32891: Add new default bridges + * Windows + OS X + Linux + * Bump Tor to 0.4.2.6 + * Windows + * Bug 32132: Re-enable jemalloc for Windows users + Tor Browser 9.0.4 -- January 9 2020 * All Platforms * Update Firefox to 68.4.1esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index c4de769..4e8ee14 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -73,9 +73,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 1b0daa12e1b8fbc8e30e7bdb5689b12774aaa9f883cb3e9ad57943a883ce65b5 + sha256sum: ced718d9d9e719547db392ad85d24a7ad5c6b54cc0f93f9c57f2fcb44bb4de56 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor/config b/projects/tor/config index 4a1045c..45e2a63 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.4.2.5 +version: 0.4.2.6 git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index d8fccd1..c394689 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,11 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.0.4' + torbrowser_version: '9.0.5' torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.0.2 - - 9.0.3 + - 9.0.4 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Add missing '#' characters in license headers
by gk＠torproject.org 06 Feb '20

06 Feb '20

commit 28c15aa19da511b213ef6e1708116013fbaef9a3 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 6 10:20:22 2020 +0000 Add missing '#' characters in license headers --- tools/authenticode_check.sh | 2 +- tools/hash_signed_bundles.sh | 2 +- tools/marsigning_check.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/authenticode_check.sh b/tools/authenticode_check.sh index 819c9d1..5d3b4cc 100755 --- a/tools/authenticode_check.sh +++ b/tools/authenticode_check.sh @@ -5,7 +5,7 @@ # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are # met: - +# # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # diff --git a/tools/hash_signed_bundles.sh b/tools/hash_signed_bundles.sh index 4354d47..1e21c49 100755 --- a/tools/hash_signed_bundles.sh +++ b/tools/hash_signed_bundles.sh @@ -5,7 +5,7 @@ # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are # met: - +# # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # diff --git a/tools/marsigning_check.sh b/tools/marsigning_check.sh index 0663603..3e58249 100755 --- a/tools/marsigning_check.sh +++ b/tools/marsigning_check.sh @@ -5,7 +5,7 @@ # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are # met: - +# # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. #

1 0

[tor-browser-build/maint-9.0] Bug 32891: Pick up new default bridge
by sysrqb＠torproject.org 06 Feb '20

06 Feb '20

commit 00fcc3970b4f0ebd924890cda54fa3ab347694a6 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Feb 5 00:30:06 2020 +0000 Bug 32891: Pick up new default bridge --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index b65c657..b0dc4b0 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 4a81e5806f36e7d0bf9492437d824599ecf4ff43 +git_hash: 18ba7d2780b1d5194cc5854d703655f6c9d3d196 git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-browser-build/maint-9.0] Bug 32053: Fix LLVM reproducibility issues
by sysrqb＠torproject.org 06 Feb '20

06 Feb '20

commit 0fbb6fa8a942e8243130f8c68616a28d4181a090 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 6 13:43:24 2019 +0000 Bug 32053: Fix LLVM reproducibility issues This patch contains two backports for reproducibility issues found and fixed in LLVM's optimization code. The patch from bug 42574 might not be necessary in our context as I only witnessed problems when compiling Stylo with an older Rust (1.32.0) and then omptimizing with LLVM 8. However, it's hard to exclude any mismatching builds we encountered so far from being affected by that issue, so I think it is safer to backport that patch as well. Bug 43909 is an issue we and Mozilla definitely hit and very likely responsible for at least the vast majority of different builds we got over the course of the last weeks and months. Many thanks to Alex Crichton for the invaluable help in tracking this issue down. --- projects/clang/42574.patch | 236 ++++++++++++++++++++++++++++++++++++++++++ projects/clang/43909.patch | 252 +++++++++++++++++++++++++++++++++++++++++++++ projects/clang/build | 4 + projects/clang/config | 2 + projects/rust/42574.patch | 236 ++++++++++++++++++++++++++++++++++++++++++ projects/rust/43909.patch | 252 +++++++++++++++++++++++++++++++++++++++++++++ projects/rust/build | 7 ++ projects/rust/config | 2 + 8 files changed, 991 insertions(+) diff --git a/projects/clang/42574.patch b/projects/clang/42574.patch new file mode 100644 index 0000000..285d254 --- /dev/null +++ b/projects/clang/42574.patch @@ -0,0 +1,236 @@ +From 3757213db371dcea53cae357cf9c56d1b0604f98 Mon Sep 17 00:00:00 2001 +From: Alina Sbirlea <asbirlea(a)google.com> +Date: Fri, 12 Jul 2019 22:30:30 +0000 +Subject: [PATCH] [MemorySSA] Use SetVector to avoid nondeterminism. + +Summary: +Use a SetVector for DeadBlockSet. +Resolves PR42574. + +Reviewers: george.burgess.iv, uabelho, dblaikie + +Subscribers: jlebar, Prazek, mgrang, llvm-commits + +Tags: #llvm + +Differential Revision: https://reviews.llvm.org/D64601 + +llvm-svn: 365970 + +diff --git a/llvm/include/llvm/Analysis/MemorySSAUpdater.h b/llvm/include/llvm/Analysis/MemorySSAUpdater.h +index 169d5bd9fa8..276620bd445 100644 +--- a/llvm/include/llvm/Analysis/MemorySSAUpdater.h ++++ b/llvm/include/llvm/Analysis/MemorySSAUpdater.h +@@ -32,6 +32,7 @@ + #ifndef LLVM_ANALYSIS_MEMORYSSAUPDATER_H + #define LLVM_ANALYSIS_MEMORYSSAUPDATER_H + ++#include "llvm/ADT/SetVector.h" + #include "llvm/ADT/SmallPtrSet.h" + #include "llvm/ADT/SmallSet.h" + #include "llvm/ADT/SmallVector.h" +@@ -239,7 +240,7 @@ public: + /// Deleted blocks still have successor info, but their predecessor edges and + /// Phi nodes may already be updated. Instructions in DeadBlocks should be + /// deleted after this call. +- void removeBlocks(const SmallPtrSetImpl<BasicBlock *> &DeadBlocks); ++ void removeBlocks(const SmallSetVector<BasicBlock *, 8> &DeadBlocks); + + /// Get handle on MemorySSA. + MemorySSA* getMemorySSA() const { return MSSA; } +diff --git a/llvm/lib/Analysis/MemorySSAUpdater.cpp b/llvm/lib/Analysis/MemorySSAUpdater.cpp +index 6c817d20368..a6c7142a697 100644 +--- a/llvm/lib/Analysis/MemorySSAUpdater.cpp ++++ b/llvm/lib/Analysis/MemorySSAUpdater.cpp +@@ -1101,7 +1101,7 @@ void MemorySSAUpdater::removeMemoryAccess(MemoryAccess *MA) { + } + + void MemorySSAUpdater::removeBlocks( +- const SmallPtrSetImpl<BasicBlock *> &DeadBlocks) { ++ const SmallSetVector<BasicBlock *, 8> &DeadBlocks) { + // First delete all uses of BB in MemoryPhis. + for (BasicBlock *BB : DeadBlocks) { + Instruction *TI = BB->getTerminator(); +diff --git a/llvm/lib/Transforms/Scalar/LoopSimplifyCFG.cpp b/llvm/lib/Transforms/Scalar/LoopSimplifyCFG.cpp +index 2e5927f9a06..f464df26a02 100644 +--- a/llvm/lib/Transforms/Scalar/LoopSimplifyCFG.cpp ++++ b/llvm/lib/Transforms/Scalar/LoopSimplifyCFG.cpp +@@ -388,8 +388,8 @@ private: + void deleteDeadLoopBlocks() { + DomTreeUpdater DTU(DT, DomTreeUpdater::UpdateStrategy::Eager); + if (MSSAU) { +- SmallPtrSet<BasicBlock *, 8> DeadLoopBlocksSet(DeadLoopBlocks.begin(), +- DeadLoopBlocks.end()); ++ SmallSetVector<BasicBlock *, 8> DeadLoopBlocksSet(DeadLoopBlocks.begin(), ++ DeadLoopBlocks.end()); + MSSAU->removeBlocks(DeadLoopBlocksSet); + } + for (auto *BB : DeadLoopBlocks) { +diff --git a/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp b/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp +index 5a67178cef3..814cf814989 100644 +--- a/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp ++++ b/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp +@@ -1436,8 +1436,8 @@ deleteDeadClonedBlocks(Loop &L, ArrayRef<BasicBlock *> ExitBlocks, + + // Remove all MemorySSA in the dead blocks + if (MSSAU) { +- SmallPtrSet<BasicBlock *, 16> DeadBlockSet(DeadBlocks.begin(), +- DeadBlocks.end()); ++ SmallSetVector<BasicBlock *, 8> DeadBlockSet(DeadBlocks.begin(), ++ DeadBlocks.end()); + MSSAU->removeBlocks(DeadBlockSet); + } + +@@ -1455,7 +1455,7 @@ static void deleteDeadBlocksFromLoop(Loop &L, + MemorySSAUpdater *MSSAU) { + // Find all the dead blocks tied to this loop, and remove them from their + // successors. +- SmallPtrSet<BasicBlock *, 16> DeadBlockSet; ++ SmallSetVector<BasicBlock *, 8> DeadBlockSet; + + // Start with loop/exit blocks and get a transitive closure of reachable dead + // blocks. +diff --git a/llvm/lib/Transforms/Utils/Local.cpp b/llvm/lib/Transforms/Utils/Local.cpp +index 499e611acb5..83dabcd7952 100644 +--- a/llvm/lib/Transforms/Utils/Local.cpp ++++ b/llvm/lib/Transforms/Utils/Local.cpp +@@ -2211,7 +2211,7 @@ bool llvm::removeUnreachableBlocks(Function &F, LazyValueInfo *LVI, + assert(Reachable.size() < F.size()); + NumRemoved += F.size()-Reachable.size(); + +- SmallPtrSet<BasicBlock *, 16> DeadBlockSet; ++ SmallSetVector<BasicBlock *, 8> DeadBlockSet; + for (Function::iterator I = ++F.begin(), E = F.end(); I != E; ++I) { + auto *BB = &*I; + if (Reachable.count(BB)) +diff --git a/llvm/test/Analysis/MemorySSA/nondeterminism.ll b/llvm/test/Analysis/MemorySSA/nondeterminism.ll +new file mode 100644 +index 00000000000..0bb3df30b58 +--- /dev/null ++++ b/llvm/test/Analysis/MemorySSA/nondeterminism.ll +@@ -0,0 +1,122 @@ ++; RUN: opt -simplifycfg -enable-mssa-loop-dependency -S --preserve-ll-uselistorder %s | FileCheck %s ++; REQUIRES: x86-registered-target ++; CHECK-LABEL: @n ++; CHECK: uselistorder i16 0, { 3, 2, 4, 1, 5, 0, 6 } ++ ++; Note: test was added in an effort to ensure determinism when updating memoryssa. See PR42574. ++; If the uselistorder check becomes no longer relevant, the test can be disabled or removed. ++ ++%rec9 = type { i16, i32, i32 } ++ ++@a = global [1 x [1 x %rec9]] zeroinitializer ++ ++define i16 @n() { ++ br label %..split_crit_edge ++ ++..split_crit_edge: ; preds = %0 ++ br label %.split ++ ++bb4.us4: ; preds = %bb2.split.us32, %bb6.us28 ++ %i.4.01.us5 = phi i16 [ %_tmp49.us30, %bb6.us28 ] ++ br label %g.exit4.us21 ++ ++bb1.i.us14: ; preds = %bb4.us4 ++ br label %g.exit4.us21 ++ ++g.exit4.us21: ; preds = %bb1.i.us14, %g.exit4.critedge.us9 ++ %i.4.02.us22 = phi i16 [ %i.4.01.us5, %bb4.us4 ], [ %i.4.01.us5, %bb1.i.us14 ] ++ br label %bb6.us28 ++ ++bb5.us26: ; preds = %g.exit4.us21 ++ br label %bb6.us28 ++ ++bb6.us28: ; preds = %bb5.us26, %g.exit4.us21 ++ %i.4.03.us29 = phi i16 [ %i.4.02.us22, %bb5.us26 ], [ %i.4.02.us22, %g.exit4.us21 ] ++ %_tmp49.us30 = add nuw nsw i16 %i.4.03.us29, 1 ++ br label %bb4.us4 ++ ++bb4.us.us: ; preds = %bb2.split.us.us, %bb6.us.us ++ %i.4.01.us.us = phi i16 [ %_tmp49.us.us, %bb6.us.us ] ++ br label %bb1.i.us.us ++ ++bb1.i.us.us: ; preds = %bb4.us.us ++ br label %g.exit4.us.us ++ ++g.exit4.us.us: ; preds = %bb1.i.us.us, %g.exit4.critedge.us.us ++ %i.4.02.us.us = phi i16 [ %i.4.01.us.us, %bb1.i.us.us ] ++ br label %bb5.us.us ++ ++bb5.us.us: ; preds = %g.exit4.us.us ++ br label %bb6.us.us ++ ++bb6.us.us: ; preds = %bb5.us.us, %g.exit4.us.us ++ %i.4.03.us.us = phi i16 [ %i.4.02.us.us, %bb5.us.us ] ++ %_tmp49.us.us = add nuw nsw i16 %i.4.03.us.us, 1 ++ br label %bb4.us.us ++ ++ ++.split: ; preds = %..split_crit_edge ++ br label %bb2 ++ ++bb2: ; preds = %.split, %bb7 ++ %h.3.0 = phi i16 [ undef, %.split ], [ %_tmp53, %bb7 ] ++ br label %bb2.bb2.split_crit_edge ++ ++bb2.bb2.split_crit_edge: ; preds = %bb2 ++ br label %bb2.split ++ ++bb2.split.us: ; preds = %bb2 ++ br label %bb4.us ++ ++bb4.us: ; preds = %bb6.us, %bb2.split.us ++ %i.4.01.us = phi i16 [ 0, %bb2.split.us ] ++ br label %bb1.i.us ++ ++g.exit4.critedge.us: ; preds = %bb4.us ++ br label %g.exit4.us ++ ++bb1.i.us: ; preds = %bb4.us ++ br label %g.exit4.us ++ ++g.exit4.us: ; preds = %bb1.i.us, %g.exit4.critedge.us ++ %i.4.02.us = phi i16 [ %i.4.01.us, %g.exit4.critedge.us ], [ %i.4.01.us, %bb1.i.us ] ++ br label %bb5.us ++ ++bb5.us: ; preds = %g.exit4.us ++ br label %bb7 ++ ++bb2.split: ; preds = %bb2.bb2.split_crit_edge ++ br label %bb4 ++ ++bb4: ; preds = %bb2.split, %bb6 ++ %i.4.01 = phi i16 [ 0, %bb2.split ] ++ %_tmp16 = getelementptr [1 x [1 x %rec9]], [1 x [1 x %rec9]]* @a, i16 0, i16 %h.3.0, i16 %i.4.01, i32 0 ++ %_tmp17 = load i16, i16* %_tmp16, align 1 ++ br label %g.exit4.critedge ++ ++bb1.i: ; preds = %bb4 ++ br label %g.exit4 ++ ++g.exit4.critedge: ; preds = %bb4 ++ %_tmp28.c = getelementptr [1 x [1 x %rec9]], [1 x [1 x %rec9]]* @a, i16 0, i16 %h.3.0, i16 %i.4.01, i32 1 ++ %_tmp29.c = load i32, i32* %_tmp28.c, align 1 ++ %_tmp30.c = trunc i32 %_tmp29.c to i16 ++ br label %g.exit4 ++ ++g.exit4: ; preds = %g.exit4.critedge, %bb1.i ++ %i.4.02 = phi i16 [ %i.4.01, %g.exit4.critedge ], [ %i.4.01, %bb1.i ] ++ %_tmp41 = getelementptr [1 x [1 x %rec9]], [1 x [1 x %rec9]]* @a, i16 0, i16 %h.3.0, i16 %i.4.02, i32 2 ++ br label %bb6 ++ ++bb5: ; preds = %g.exit4 ++ br label %bb6 ++ ++bb6: ; preds = %bb5, %g.exit4 ++ %i.4.03 = phi i16 [ %i.4.02, %bb5 ], [ %i.4.02, %g.exit4 ] ++ %_tmp49 = add nuw nsw i16 %i.4.03, 1 ++ br label %bb7 ++ ++bb7: ; preds = %bb7.us-lcssa.us, %bb7.us-lcssa ++ %_tmp53 = add nsw i16 %h.3.0, 1 ++ br label %bb2 ++} +-- +2.24.0 + diff --git a/projects/clang/43909.patch b/projects/clang/43909.patch new file mode 100644 index 0000000..78d2a75 --- /dev/null +++ b/projects/clang/43909.patch @@ -0,0 +1,252 @@ +From c95310f2d4fd3c88241c3b5d6dbf6251d34a3256 Mon Sep 17 00:00:00 2001 +From: Nikita Popov <nikita.ppv(a)gmail.com> +Date: Sat, 16 Nov 2019 16:22:18 +0100 +Subject: [PATCH] Restructure caching + +Variant on D70103. The caching is switched to always use a BB to +cache entry map, which then contains per-value caches. A separate +set contains value handles with a deletion callback. This allows us +to properly invalidate overdefined values. + +A possible alternative would be to always cache by value first and +have per-BB maps/sets in the each cache entry. In that case we could +use a ValueMap and would avoid the separate value handle set. I went +with the BB indexing at the top level to make it easier to integrate +D69914, but possibly that's not the right choice. + +Differential Revision: https://reviews.llvm.org/D70376 + +diff --git a/llvm/lib/Analysis/LazyValueInfo.cpp b/llvm/lib/Analysis/LazyValueInfo.cpp +index 110c085d3f3..aa6862cb588 100644 +--- a/llvm/lib/Analysis/LazyValueInfo.cpp ++++ b/llvm/lib/Analysis/LazyValueInfo.cpp +@@ -133,12 +133,9 @@ namespace { + /// A callback value handle updates the cache when values are erased. + class LazyValueInfoCache; + struct LVIValueHandle final : public CallbackVH { +- // Needs to access getValPtr(), which is protected. +- friend struct DenseMapInfo<LVIValueHandle>; +- + LazyValueInfoCache *Parent; + +- LVIValueHandle(Value *V, LazyValueInfoCache *P) ++ LVIValueHandle(Value *V, LazyValueInfoCache *P = nullptr) + : CallbackVH(V), Parent(P) { } + + void deleted() override; +@@ -152,89 +149,63 @@ namespace { + /// This is the cache kept by LazyValueInfo which + /// maintains information about queries across the clients' queries. + class LazyValueInfoCache { +- /// This is all of the cached block information for exactly one Value*. +- /// The entries are sorted by the BasicBlock* of the +- /// entries, allowing us to do a lookup with a binary search. +- /// Over-defined lattice values are recorded in OverDefinedCache to reduce +- /// memory overhead. +- struct ValueCacheEntryTy { +- ValueCacheEntryTy(Value *V, LazyValueInfoCache *P) : Handle(V, P) {} +- LVIValueHandle Handle; +- SmallDenseMap<PoisoningVH<BasicBlock>, ValueLatticeElement, 4> BlockVals; ++ /// This is all of the cached information for one basic block. It contains ++ /// the per-value lattice elements, as well as a separate set for ++ /// overdefined values to reduce memory usage. ++ struct BlockCacheEntryTy { ++ SmallDenseMap<AssertingVH<Value>, ValueLatticeElement, 4> LatticeElements; ++ SmallDenseSet<AssertingVH<Value>, 4> OverDefined; + }; + +- /// This tracks, on a per-block basis, the set of values that are +- /// over-defined at the end of that block. +- typedef DenseMap<PoisoningVH<BasicBlock>, SmallPtrSet<Value *, 4>> +- OverDefinedCacheTy; +- /// Keep track of all blocks that we have ever seen, so we +- /// don't spend time removing unused blocks from our caches. +- DenseSet<PoisoningVH<BasicBlock> > SeenBlocks; +- +- /// This is all of the cached information for all values, +- /// mapped from Value* to key information. +- DenseMap<Value *, std::unique_ptr<ValueCacheEntryTy>> ValueCache; +- OverDefinedCacheTy OverDefinedCache; +- ++ /// Cached information per basic block. ++ DenseMap<PoisoningVH<BasicBlock>, BlockCacheEntryTy> BlockCache; ++ /// Set of value handles used to erase values from the cache on deletion. ++ DenseSet<LVIValueHandle, DenseMapInfo<Value *>> ValueHandles; + + public: + void insertResult(Value *Val, BasicBlock *BB, + const ValueLatticeElement &Result) { +- SeenBlocks.insert(BB); +- ++ auto &CacheEntry = BlockCache.try_emplace(BB).first->second; + // Insert over-defined values into their own cache to reduce memory + // overhead. + if (Result.isOverdefined()) +- OverDefinedCache[BB].insert(Val); +- else { +- auto It = ValueCache.find_as(Val); +- if (It == ValueCache.end()) { +- ValueCache[Val] = make_unique<ValueCacheEntryTy>(Val, this); +- It = ValueCache.find_as(Val); +- assert(It != ValueCache.end() && "Val was just added to the map!"); +- } +- It->second->BlockVals[BB] = Result; +- } +- } +- +- bool isOverdefined(Value *V, BasicBlock *BB) const { +- auto ODI = OverDefinedCache.find(BB); +- +- if (ODI == OverDefinedCache.end()) +- return false; ++ CacheEntry.OverDefined.insert(Val); ++ else ++ CacheEntry.LatticeElements.insert({ Val, Result }); + +- return ODI->second.count(V); ++ auto HandleIt = ValueHandles.find_as(Val); ++ if (HandleIt == ValueHandles.end()) ++ ValueHandles.insert({ Val, this }); + } + + bool hasCachedValueInfo(Value *V, BasicBlock *BB) const { +- if (isOverdefined(V, BB)) +- return true; +- +- auto I = ValueCache.find_as(V); +- if (I == ValueCache.end()) ++ auto It = BlockCache.find(BB); ++ if (It == BlockCache.end()) + return false; + +- return I->second->BlockVals.count(BB); ++ return It->second.OverDefined.count(V) || ++ It->second.LatticeElements.count(V); + } + + ValueLatticeElement getCachedValueInfo(Value *V, BasicBlock *BB) const { +- if (isOverdefined(V, BB)) ++ auto It = BlockCache.find(BB); ++ if (It == BlockCache.end()) ++ return ValueLatticeElement(); ++ ++ if (It->second.OverDefined.count(V)) + return ValueLatticeElement::getOverdefined(); + +- auto I = ValueCache.find_as(V); +- if (I == ValueCache.end()) ++ auto LatticeIt = It->second.LatticeElements.find(V); ++ if (LatticeIt == It->second.LatticeElements.end()) + return ValueLatticeElement(); +- auto BBI = I->second->BlockVals.find(BB); +- if (BBI == I->second->BlockVals.end()) +- return ValueLatticeElement(); +- return BBI->second; ++ ++ return LatticeIt->second; + } + + /// clear - Empty the cache. + void clear() { +- SeenBlocks.clear(); +- ValueCache.clear(); +- OverDefinedCache.clear(); ++ BlockCache.clear(); ++ ValueHandles.clear(); + } + + /// Inform the cache that a given value has been deleted. +@@ -248,23 +219,18 @@ namespace { + /// OldSucc might have (unless also overdefined in NewSucc). This just + /// flushes elements from the cache and does not add any. + void threadEdgeImpl(BasicBlock *OldSucc,BasicBlock *NewSucc); +- +- friend struct LVIValueHandle; + }; + } + + void LazyValueInfoCache::eraseValue(Value *V) { +- for (auto I = OverDefinedCache.begin(), E = OverDefinedCache.end(); I != E;) { +- // Copy and increment the iterator immediately so we can erase behind +- // ourselves. +- auto Iter = I++; +- SmallPtrSetImpl<Value *> &ValueSet = Iter->second; +- ValueSet.erase(V); +- if (ValueSet.empty()) +- OverDefinedCache.erase(Iter); ++ for (auto &Pair : BlockCache) { ++ Pair.second.LatticeElements.erase(V); ++ Pair.second.OverDefined.erase(V); + } + +- ValueCache.erase(V); ++ auto HandleIt = ValueHandles.find_as(V); ++ if (HandleIt != ValueHandles.end()) ++ ValueHandles.erase(HandleIt); + } + + void LVIValueHandle::deleted() { +@@ -274,18 +240,7 @@ void LVIValueHandle::deleted() { + } + + void LazyValueInfoCache::eraseBlock(BasicBlock *BB) { +- // Shortcut if we have never seen this block. +- DenseSet<PoisoningVH<BasicBlock> >::iterator I = SeenBlocks.find(BB); +- if (I == SeenBlocks.end()) +- return; +- SeenBlocks.erase(I); +- +- auto ODI = OverDefinedCache.find(BB); +- if (ODI != OverDefinedCache.end()) +- OverDefinedCache.erase(ODI); +- +- for (auto &I : ValueCache) +- I.second->BlockVals.erase(BB); ++ BlockCache.erase(BB); + } + + void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, +@@ -303,10 +258,11 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, + std::vector<BasicBlock*> worklist; + worklist.push_back(OldSucc); + +- auto I = OverDefinedCache.find(OldSucc); +- if (I == OverDefinedCache.end()) ++ auto I = BlockCache.find(OldSucc); ++ if (I == BlockCache.end() || I->second.OverDefined.empty()) + return; // Nothing to process here. +- SmallVector<Value *, 4> ValsToClear(I->second.begin(), I->second.end()); ++ SmallVector<Value *, 4> ValsToClear(I->second.OverDefined.begin(), ++ I->second.OverDefined.end()); + + // Use a worklist to perform a depth-first search of OldSucc's successors. + // NOTE: We do not need a visited list since any blocks we have already +@@ -320,10 +276,10 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, + if (ToUpdate == NewSucc) continue; + + // If a value was marked overdefined in OldSucc, and is here too... +- auto OI = OverDefinedCache.find(ToUpdate); +- if (OI == OverDefinedCache.end()) ++ auto OI = BlockCache.find(ToUpdate); ++ if (OI == BlockCache.end() || OI->second.OverDefined.empty()) + continue; +- SmallPtrSetImpl<Value *> &ValueSet = OI->second; ++ auto &ValueSet = OI->second.OverDefined; + + bool changed = false; + for (Value *V : ValsToClear) { +@@ -333,11 +289,6 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, + // If we removed anything, then we potentially need to update + // blocks successors too. + changed = true; +- +- if (ValueSet.empty()) { +- OverDefinedCache.erase(OI); +- break; +- } + } + + if (!changed) continue; +-- +2.24.0 + diff --git a/projects/clang/build b/projects/clang/build index c1afa6d..825b21e 100644 --- a/projects/clang/build +++ b/projects/clang/build @@ -20,6 +20,10 @@ tar -xf $rootdir/[% c('input_files_by_name/libcxxabi') %] tar -xf $rootdir/[% c('input_files_by_name/lld') %] tar -xf $rootdir/[% c('input_files_by_name/compiler-rt') %] mv llvm-* llvm +# LLVM has reproducibility issues when optimizing bitcode, which we need to +# patch. See: #32053 for more details. +patch -p1 < $rootdir/42574.patch +patch -p1 < $rootdir/43909.patch mv cfe-* llvm/tools/clang mv libcxx-* llvm/projects/libcxx mv libcxxabi-* llvm/projects/libcxxabi diff --git a/projects/clang/config b/projects/clang/config index 08231be..59a9102 100644 --- a/projects/clang/config +++ b/projects/clang/config @@ -45,3 +45,5 @@ input_files: enable: '[% c("var/windows") %]' - filename: timestamp.patch enable: '[% c("var/windows") %]' + - filename: 42574.patch + - filename: 43909.patch diff --git a/projects/rust/42574.patch b/projects/rust/42574.patch new file mode 100644 index 0000000..285d254 --- /dev/null +++ b/projects/rust/42574.patch @@ -0,0 +1,236 @@ +From 3757213db371dcea53cae357cf9c56d1b0604f98 Mon Sep 17 00:00:00 2001 +From: Alina Sbirlea <asbirlea(a)google.com> +Date: Fri, 12 Jul 2019 22:30:30 +0000 +Subject: [PATCH] [MemorySSA] Use SetVector to avoid nondeterminism. + +Summary: +Use a SetVector for DeadBlockSet. +Resolves PR42574. + +Reviewers: george.burgess.iv, uabelho, dblaikie + +Subscribers: jlebar, Prazek, mgrang, llvm-commits + +Tags: #llvm + +Differential Revision: https://reviews.llvm.org/D64601 + +llvm-svn: 365970 + +diff --git a/llvm/include/llvm/Analysis/MemorySSAUpdater.h b/llvm/include/llvm/Analysis/MemorySSAUpdater.h +index 169d5bd9fa8..276620bd445 100644 +--- a/llvm/include/llvm/Analysis/MemorySSAUpdater.h ++++ b/llvm/include/llvm/Analysis/MemorySSAUpdater.h +@@ -32,6 +32,7 @@ + #ifndef LLVM_ANALYSIS_MEMORYSSAUPDATER_H + #define LLVM_ANALYSIS_MEMORYSSAUPDATER_H + ++#include "llvm/ADT/SetVector.h" + #include "llvm/ADT/SmallPtrSet.h" + #include "llvm/ADT/SmallSet.h" + #include "llvm/ADT/SmallVector.h" +@@ -239,7 +240,7 @@ public: + /// Deleted blocks still have successor info, but their predecessor edges and + /// Phi nodes may already be updated. Instructions in DeadBlocks should be + /// deleted after this call. +- void removeBlocks(const SmallPtrSetImpl<BasicBlock *> &DeadBlocks); ++ void removeBlocks(const SmallSetVector<BasicBlock *, 8> &DeadBlocks); + + /// Get handle on MemorySSA. + MemorySSA* getMemorySSA() const { return MSSA; } +diff --git a/llvm/lib/Analysis/MemorySSAUpdater.cpp b/llvm/lib/Analysis/MemorySSAUpdater.cpp +index 6c817d20368..a6c7142a697 100644 +--- a/llvm/lib/Analysis/MemorySSAUpdater.cpp ++++ b/llvm/lib/Analysis/MemorySSAUpdater.cpp +@@ -1101,7 +1101,7 @@ void MemorySSAUpdater::removeMemoryAccess(MemoryAccess *MA) { + } + + void MemorySSAUpdater::removeBlocks( +- const SmallPtrSetImpl<BasicBlock *> &DeadBlocks) { ++ const SmallSetVector<BasicBlock *, 8> &DeadBlocks) { + // First delete all uses of BB in MemoryPhis. + for (BasicBlock *BB : DeadBlocks) { + Instruction *TI = BB->getTerminator(); +diff --git a/llvm/lib/Transforms/Scalar/LoopSimplifyCFG.cpp b/llvm/lib/Transforms/Scalar/LoopSimplifyCFG.cpp +index 2e5927f9a06..f464df26a02 100644 +--- a/llvm/lib/Transforms/Scalar/LoopSimplifyCFG.cpp ++++ b/llvm/lib/Transforms/Scalar/LoopSimplifyCFG.cpp +@@ -388,8 +388,8 @@ private: + void deleteDeadLoopBlocks() { + DomTreeUpdater DTU(DT, DomTreeUpdater::UpdateStrategy::Eager); + if (MSSAU) { +- SmallPtrSet<BasicBlock *, 8> DeadLoopBlocksSet(DeadLoopBlocks.begin(), +- DeadLoopBlocks.end()); ++ SmallSetVector<BasicBlock *, 8> DeadLoopBlocksSet(DeadLoopBlocks.begin(), ++ DeadLoopBlocks.end()); + MSSAU->removeBlocks(DeadLoopBlocksSet); + } + for (auto *BB : DeadLoopBlocks) { +diff --git a/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp b/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp +index 5a67178cef3..814cf814989 100644 +--- a/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp ++++ b/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp +@@ -1436,8 +1436,8 @@ deleteDeadClonedBlocks(Loop &L, ArrayRef<BasicBlock *> ExitBlocks, + + // Remove all MemorySSA in the dead blocks + if (MSSAU) { +- SmallPtrSet<BasicBlock *, 16> DeadBlockSet(DeadBlocks.begin(), +- DeadBlocks.end()); ++ SmallSetVector<BasicBlock *, 8> DeadBlockSet(DeadBlocks.begin(), ++ DeadBlocks.end()); + MSSAU->removeBlocks(DeadBlockSet); + } + +@@ -1455,7 +1455,7 @@ static void deleteDeadBlocksFromLoop(Loop &L, + MemorySSAUpdater *MSSAU) { + // Find all the dead blocks tied to this loop, and remove them from their + // successors. +- SmallPtrSet<BasicBlock *, 16> DeadBlockSet; ++ SmallSetVector<BasicBlock *, 8> DeadBlockSet; + + // Start with loop/exit blocks and get a transitive closure of reachable dead + // blocks. +diff --git a/llvm/lib/Transforms/Utils/Local.cpp b/llvm/lib/Transforms/Utils/Local.cpp +index 499e611acb5..83dabcd7952 100644 +--- a/llvm/lib/Transforms/Utils/Local.cpp ++++ b/llvm/lib/Transforms/Utils/Local.cpp +@@ -2211,7 +2211,7 @@ bool llvm::removeUnreachableBlocks(Function &F, LazyValueInfo *LVI, + assert(Reachable.size() < F.size()); + NumRemoved += F.size()-Reachable.size(); + +- SmallPtrSet<BasicBlock *, 16> DeadBlockSet; ++ SmallSetVector<BasicBlock *, 8> DeadBlockSet; + for (Function::iterator I = ++F.begin(), E = F.end(); I != E; ++I) { + auto *BB = &*I; + if (Reachable.count(BB)) +diff --git a/llvm/test/Analysis/MemorySSA/nondeterminism.ll b/llvm/test/Analysis/MemorySSA/nondeterminism.ll +new file mode 100644 +index 00000000000..0bb3df30b58 +--- /dev/null ++++ b/llvm/test/Analysis/MemorySSA/nondeterminism.ll +@@ -0,0 +1,122 @@ ++; RUN: opt -simplifycfg -enable-mssa-loop-dependency -S --preserve-ll-uselistorder %s | FileCheck %s ++; REQUIRES: x86-registered-target ++; CHECK-LABEL: @n ++; CHECK: uselistorder i16 0, { 3, 2, 4, 1, 5, 0, 6 } ++ ++; Note: test was added in an effort to ensure determinism when updating memoryssa. See PR42574. ++; If the uselistorder check becomes no longer relevant, the test can be disabled or removed. ++ ++%rec9 = type { i16, i32, i32 } ++ ++@a = global [1 x [1 x %rec9]] zeroinitializer ++ ++define i16 @n() { ++ br label %..split_crit_edge ++ ++..split_crit_edge: ; preds = %0 ++ br label %.split ++ ++bb4.us4: ; preds = %bb2.split.us32, %bb6.us28 ++ %i.4.01.us5 = phi i16 [ %_tmp49.us30, %bb6.us28 ] ++ br label %g.exit4.us21 ++ ++bb1.i.us14: ; preds = %bb4.us4 ++ br label %g.exit4.us21 ++ ++g.exit4.us21: ; preds = %bb1.i.us14, %g.exit4.critedge.us9 ++ %i.4.02.us22 = phi i16 [ %i.4.01.us5, %bb4.us4 ], [ %i.4.01.us5, %bb1.i.us14 ] ++ br label %bb6.us28 ++ ++bb5.us26: ; preds = %g.exit4.us21 ++ br label %bb6.us28 ++ ++bb6.us28: ; preds = %bb5.us26, %g.exit4.us21 ++ %i.4.03.us29 = phi i16 [ %i.4.02.us22, %bb5.us26 ], [ %i.4.02.us22, %g.exit4.us21 ] ++ %_tmp49.us30 = add nuw nsw i16 %i.4.03.us29, 1 ++ br label %bb4.us4 ++ ++bb4.us.us: ; preds = %bb2.split.us.us, %bb6.us.us ++ %i.4.01.us.us = phi i16 [ %_tmp49.us.us, %bb6.us.us ] ++ br label %bb1.i.us.us ++ ++bb1.i.us.us: ; preds = %bb4.us.us ++ br label %g.exit4.us.us ++ ++g.exit4.us.us: ; preds = %bb1.i.us.us, %g.exit4.critedge.us.us ++ %i.4.02.us.us = phi i16 [ %i.4.01.us.us, %bb1.i.us.us ] ++ br label %bb5.us.us ++ ++bb5.us.us: ; preds = %g.exit4.us.us ++ br label %bb6.us.us ++ ++bb6.us.us: ; preds = %bb5.us.us, %g.exit4.us.us ++ %i.4.03.us.us = phi i16 [ %i.4.02.us.us, %bb5.us.us ] ++ %_tmp49.us.us = add nuw nsw i16 %i.4.03.us.us, 1 ++ br label %bb4.us.us ++ ++ ++.split: ; preds = %..split_crit_edge ++ br label %bb2 ++ ++bb2: ; preds = %.split, %bb7 ++ %h.3.0 = phi i16 [ undef, %.split ], [ %_tmp53, %bb7 ] ++ br label %bb2.bb2.split_crit_edge ++ ++bb2.bb2.split_crit_edge: ; preds = %bb2 ++ br label %bb2.split ++ ++bb2.split.us: ; preds = %bb2 ++ br label %bb4.us ++ ++bb4.us: ; preds = %bb6.us, %bb2.split.us ++ %i.4.01.us = phi i16 [ 0, %bb2.split.us ] ++ br label %bb1.i.us ++ ++g.exit4.critedge.us: ; preds = %bb4.us ++ br label %g.exit4.us ++ ++bb1.i.us: ; preds = %bb4.us ++ br label %g.exit4.us ++ ++g.exit4.us: ; preds = %bb1.i.us, %g.exit4.critedge.us ++ %i.4.02.us = phi i16 [ %i.4.01.us, %g.exit4.critedge.us ], [ %i.4.01.us, %bb1.i.us ] ++ br label %bb5.us ++ ++bb5.us: ; preds = %g.exit4.us ++ br label %bb7 ++ ++bb2.split: ; preds = %bb2.bb2.split_crit_edge ++ br label %bb4 ++ ++bb4: ; preds = %bb2.split, %bb6 ++ %i.4.01 = phi i16 [ 0, %bb2.split ] ++ %_tmp16 = getelementptr [1 x [1 x %rec9]], [1 x [1 x %rec9]]* @a, i16 0, i16 %h.3.0, i16 %i.4.01, i32 0 ++ %_tmp17 = load i16, i16* %_tmp16, align 1 ++ br label %g.exit4.critedge ++ ++bb1.i: ; preds = %bb4 ++ br label %g.exit4 ++ ++g.exit4.critedge: ; preds = %bb4 ++ %_tmp28.c = getelementptr [1 x [1 x %rec9]], [1 x [1 x %rec9]]* @a, i16 0, i16 %h.3.0, i16 %i.4.01, i32 1 ++ %_tmp29.c = load i32, i32* %_tmp28.c, align 1 ++ %_tmp30.c = trunc i32 %_tmp29.c to i16 ++ br label %g.exit4 ++ ++g.exit4: ; preds = %g.exit4.critedge, %bb1.i ++ %i.4.02 = phi i16 [ %i.4.01, %g.exit4.critedge ], [ %i.4.01, %bb1.i ] ++ %_tmp41 = getelementptr [1 x [1 x %rec9]], [1 x [1 x %rec9]]* @a, i16 0, i16 %h.3.0, i16 %i.4.02, i32 2 ++ br label %bb6 ++ ++bb5: ; preds = %g.exit4 ++ br label %bb6 ++ ++bb6: ; preds = %bb5, %g.exit4 ++ %i.4.03 = phi i16 [ %i.4.02, %bb5 ], [ %i.4.02, %g.exit4 ] ++ %_tmp49 = add nuw nsw i16 %i.4.03, 1 ++ br label %bb7 ++ ++bb7: ; preds = %bb7.us-lcssa.us, %bb7.us-lcssa ++ %_tmp53 = add nsw i16 %h.3.0, 1 ++ br label %bb2 ++} +-- +2.24.0 + diff --git a/projects/rust/43909.patch b/projects/rust/43909.patch new file mode 100644 index 0000000..78d2a75 --- /dev/null +++ b/projects/rust/43909.patch @@ -0,0 +1,252 @@ +From c95310f2d4fd3c88241c3b5d6dbf6251d34a3256 Mon Sep 17 00:00:00 2001 +From: Nikita Popov <nikita.ppv(a)gmail.com> +Date: Sat, 16 Nov 2019 16:22:18 +0100 +Subject: [PATCH] Restructure caching + +Variant on D70103. The caching is switched to always use a BB to +cache entry map, which then contains per-value caches. A separate +set contains value handles with a deletion callback. This allows us +to properly invalidate overdefined values. + +A possible alternative would be to always cache by value first and +have per-BB maps/sets in the each cache entry. In that case we could +use a ValueMap and would avoid the separate value handle set. I went +with the BB indexing at the top level to make it easier to integrate +D69914, but possibly that's not the right choice. + +Differential Revision: https://reviews.llvm.org/D70376 + +diff --git a/llvm/lib/Analysis/LazyValueInfo.cpp b/llvm/lib/Analysis/LazyValueInfo.cpp +index 110c085d3f3..aa6862cb588 100644 +--- a/llvm/lib/Analysis/LazyValueInfo.cpp ++++ b/llvm/lib/Analysis/LazyValueInfo.cpp +@@ -133,12 +133,9 @@ namespace { + /// A callback value handle updates the cache when values are erased. + class LazyValueInfoCache; + struct LVIValueHandle final : public CallbackVH { +- // Needs to access getValPtr(), which is protected. +- friend struct DenseMapInfo<LVIValueHandle>; +- + LazyValueInfoCache *Parent; + +- LVIValueHandle(Value *V, LazyValueInfoCache *P) ++ LVIValueHandle(Value *V, LazyValueInfoCache *P = nullptr) + : CallbackVH(V), Parent(P) { } + + void deleted() override; +@@ -152,89 +149,63 @@ namespace { + /// This is the cache kept by LazyValueInfo which + /// maintains information about queries across the clients' queries. + class LazyValueInfoCache { +- /// This is all of the cached block information for exactly one Value*. +- /// The entries are sorted by the BasicBlock* of the +- /// entries, allowing us to do a lookup with a binary search. +- /// Over-defined lattice values are recorded in OverDefinedCache to reduce +- /// memory overhead. +- struct ValueCacheEntryTy { +- ValueCacheEntryTy(Value *V, LazyValueInfoCache *P) : Handle(V, P) {} +- LVIValueHandle Handle; +- SmallDenseMap<PoisoningVH<BasicBlock>, ValueLatticeElement, 4> BlockVals; ++ /// This is all of the cached information for one basic block. It contains ++ /// the per-value lattice elements, as well as a separate set for ++ /// overdefined values to reduce memory usage. ++ struct BlockCacheEntryTy { ++ SmallDenseMap<AssertingVH<Value>, ValueLatticeElement, 4> LatticeElements; ++ SmallDenseSet<AssertingVH<Value>, 4> OverDefined; + }; + +- /// This tracks, on a per-block basis, the set of values that are +- /// over-defined at the end of that block. +- typedef DenseMap<PoisoningVH<BasicBlock>, SmallPtrSet<Value *, 4>> +- OverDefinedCacheTy; +- /// Keep track of all blocks that we have ever seen, so we +- /// don't spend time removing unused blocks from our caches. +- DenseSet<PoisoningVH<BasicBlock> > SeenBlocks; +- +- /// This is all of the cached information for all values, +- /// mapped from Value* to key information. +- DenseMap<Value *, std::unique_ptr<ValueCacheEntryTy>> ValueCache; +- OverDefinedCacheTy OverDefinedCache; +- ++ /// Cached information per basic block. ++ DenseMap<PoisoningVH<BasicBlock>, BlockCacheEntryTy> BlockCache; ++ /// Set of value handles used to erase values from the cache on deletion. ++ DenseSet<LVIValueHandle, DenseMapInfo<Value *>> ValueHandles; + + public: + void insertResult(Value *Val, BasicBlock *BB, + const ValueLatticeElement &Result) { +- SeenBlocks.insert(BB); +- ++ auto &CacheEntry = BlockCache.try_emplace(BB).first->second; + // Insert over-defined values into their own cache to reduce memory + // overhead. + if (Result.isOverdefined()) +- OverDefinedCache[BB].insert(Val); +- else { +- auto It = ValueCache.find_as(Val); +- if (It == ValueCache.end()) { +- ValueCache[Val] = make_unique<ValueCacheEntryTy>(Val, this); +- It = ValueCache.find_as(Val); +- assert(It != ValueCache.end() && "Val was just added to the map!"); +- } +- It->second->BlockVals[BB] = Result; +- } +- } +- +- bool isOverdefined(Value *V, BasicBlock *BB) const { +- auto ODI = OverDefinedCache.find(BB); +- +- if (ODI == OverDefinedCache.end()) +- return false; ++ CacheEntry.OverDefined.insert(Val); ++ else ++ CacheEntry.LatticeElements.insert({ Val, Result }); + +- return ODI->second.count(V); ++ auto HandleIt = ValueHandles.find_as(Val); ++ if (HandleIt == ValueHandles.end()) ++ ValueHandles.insert({ Val, this }); + } + + bool hasCachedValueInfo(Value *V, BasicBlock *BB) const { +- if (isOverdefined(V, BB)) +- return true; +- +- auto I = ValueCache.find_as(V); +- if (I == ValueCache.end()) ++ auto It = BlockCache.find(BB); ++ if (It == BlockCache.end()) + return false; + +- return I->second->BlockVals.count(BB); ++ return It->second.OverDefined.count(V) || ++ It->second.LatticeElements.count(V); + } + + ValueLatticeElement getCachedValueInfo(Value *V, BasicBlock *BB) const { +- if (isOverdefined(V, BB)) ++ auto It = BlockCache.find(BB); ++ if (It == BlockCache.end()) ++ return ValueLatticeElement(); ++ ++ if (It->second.OverDefined.count(V)) + return ValueLatticeElement::getOverdefined(); + +- auto I = ValueCache.find_as(V); +- if (I == ValueCache.end()) ++ auto LatticeIt = It->second.LatticeElements.find(V); ++ if (LatticeIt == It->second.LatticeElements.end()) + return ValueLatticeElement(); +- auto BBI = I->second->BlockVals.find(BB); +- if (BBI == I->second->BlockVals.end()) +- return ValueLatticeElement(); +- return BBI->second; ++ ++ return LatticeIt->second; + } + + /// clear - Empty the cache. + void clear() { +- SeenBlocks.clear(); +- ValueCache.clear(); +- OverDefinedCache.clear(); ++ BlockCache.clear(); ++ ValueHandles.clear(); + } + + /// Inform the cache that a given value has been deleted. +@@ -248,23 +219,18 @@ namespace { + /// OldSucc might have (unless also overdefined in NewSucc). This just + /// flushes elements from the cache and does not add any. + void threadEdgeImpl(BasicBlock *OldSucc,BasicBlock *NewSucc); +- +- friend struct LVIValueHandle; + }; + } + + void LazyValueInfoCache::eraseValue(Value *V) { +- for (auto I = OverDefinedCache.begin(), E = OverDefinedCache.end(); I != E;) { +- // Copy and increment the iterator immediately so we can erase behind +- // ourselves. +- auto Iter = I++; +- SmallPtrSetImpl<Value *> &ValueSet = Iter->second; +- ValueSet.erase(V); +- if (ValueSet.empty()) +- OverDefinedCache.erase(Iter); ++ for (auto &Pair : BlockCache) { ++ Pair.second.LatticeElements.erase(V); ++ Pair.second.OverDefined.erase(V); + } + +- ValueCache.erase(V); ++ auto HandleIt = ValueHandles.find_as(V); ++ if (HandleIt != ValueHandles.end()) ++ ValueHandles.erase(HandleIt); + } + + void LVIValueHandle::deleted() { +@@ -274,18 +240,7 @@ void LVIValueHandle::deleted() { + } + + void LazyValueInfoCache::eraseBlock(BasicBlock *BB) { +- // Shortcut if we have never seen this block. +- DenseSet<PoisoningVH<BasicBlock> >::iterator I = SeenBlocks.find(BB); +- if (I == SeenBlocks.end()) +- return; +- SeenBlocks.erase(I); +- +- auto ODI = OverDefinedCache.find(BB); +- if (ODI != OverDefinedCache.end()) +- OverDefinedCache.erase(ODI); +- +- for (auto &I : ValueCache) +- I.second->BlockVals.erase(BB); ++ BlockCache.erase(BB); + } + + void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, +@@ -303,10 +258,11 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, + std::vector<BasicBlock*> worklist; + worklist.push_back(OldSucc); + +- auto I = OverDefinedCache.find(OldSucc); +- if (I == OverDefinedCache.end()) ++ auto I = BlockCache.find(OldSucc); ++ if (I == BlockCache.end() || I->second.OverDefined.empty()) + return; // Nothing to process here. +- SmallVector<Value *, 4> ValsToClear(I->second.begin(), I->second.end()); ++ SmallVector<Value *, 4> ValsToClear(I->second.OverDefined.begin(), ++ I->second.OverDefined.end()); + + // Use a worklist to perform a depth-first search of OldSucc's successors. + // NOTE: We do not need a visited list since any blocks we have already +@@ -320,10 +276,10 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, + if (ToUpdate == NewSucc) continue; + + // If a value was marked overdefined in OldSucc, and is here too... +- auto OI = OverDefinedCache.find(ToUpdate); +- if (OI == OverDefinedCache.end()) ++ auto OI = BlockCache.find(ToUpdate); ++ if (OI == BlockCache.end() || OI->second.OverDefined.empty()) + continue; +- SmallPtrSetImpl<Value *> &ValueSet = OI->second; ++ auto &ValueSet = OI->second.OverDefined; + + bool changed = false; + for (Value *V : ValsToClear) { +@@ -333,11 +289,6 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, + // If we removed anything, then we potentially need to update + // blocks successors too. + changed = true; +- +- if (ValueSet.empty()) { +- OverDefinedCache.erase(OI); +- break; +- } + } + + if (!changed) continue; +-- +2.24.0 + diff --git a/projects/rust/build b/projects/rust/build index 9a6b54a..8b45e3f 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -51,6 +51,13 @@ mkdir /var/tmp/build tar -C /var/tmp/build -xf [% c('input_files_by_name/rust') %] cd /var/tmp/build/rustc-[% c('version') %]-src +# LLVM has reproducibility issues when optimizing bitcode, which we need to +# patch. See: #32053 for more details. +cd src/llvm-project +patch -p1 < $rootdir/42574.patch +patch -p1 < $rootdir/43909.patch +cd ../../ + [% IF c("var/windows-i686") %] # Cross-compiling for Windows 32bit is currently not possible without any # patches. The reason for that is libstd expecting DWARF unwinding while most diff --git a/projects/rust/config b/projects/rust/config index 03d7be0..848ccd0 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -106,3 +106,5 @@ input_files: gpg_keyring: rust.gpg - filename: unwind.patch enable: '[% c("var/windows-i686") %]' + - filename: 42574.patch + - filename: 43909.patch

1 0

[tor-browser-build/maint-9.0] Bug 32132: Re-enable jemalloc for Windows users
by sysrqb＠torproject.org 06 Feb '20

06 Feb '20

commit 153b7d9b25f10f983f7577fb00d8e4c594e06738 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 17 20:56:29 2019 +0000 Bug 32132: Re-enable jemalloc for Windows users Now that https://bugzilla.mozilla.org/show_bug.cgi?id=1547519 got backported (to esr68.2.0) we can re-enable jemalloc for Windows users. --- projects/firefox/mozconfig-windows-i686 | 3 +-- projects/firefox/mozconfig-windows-x86_64 | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index 685b294..fe3cc7d 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -38,8 +38,7 @@ ac_add_options --disable-maintenance-service ac_add_options --enable-proxy-bypass-protection ac_add_options --disable-webrtc # Bug 1393901 ac_add_options --disable-tests -ac_add_options --disable-jemalloc # Bug 154751 ac_add_options --disable-geckodriver # Bug 1489320 # Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= \ No newline at end of file +ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index 92c774c..ef28c9b 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -38,8 +38,7 @@ ac_add_options --disable-maintenance-service ac_add_options --enable-proxy-bypass-protection ac_add_options --disable-webrtc # Bug 1393901 ac_add_options --disable-tests -ac_add_options --disable-jemalloc # Bug 1547519 ac_add_options --disable-geckodriver # Bug 1489320 # Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= \ No newline at end of file +ac_add_options MOZ_TELEMETRY_REPORTING=

1 0

[tor-browser/tor-browser-68.4.1esr-9.0-1] Bug 1598647 - Set Origin to null with network.http.referer.hideOnionSource r=JuniorHsu
by sysrqb＠torproject.org 06 Feb '20

06 Feb '20

commit 5526a109e6266ce31f8014912d5b91b154736ef6 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Nov 25 13:29:47 2019 +0000 Bug 1598647 - Set Origin to null with network.http.referer.hideOnionSource r=JuniorHsu Differential Revision: https://phabricator.services.mozilla.com/D54303 --HG-- extra : moz-landing-system : lando --- dom/security/ReferrerInfo.cpp | 3 ++- dom/security/ReferrerInfo.h | 2 +- netwerk/protocol/http/nsCORSListenerProxy.cpp | 2 +- netwerk/protocol/http/nsHttpChannel.cpp | 17 +++++++---------- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dom/security/ReferrerInfo.cpp b/dom/security/ReferrerInfo.cpp index 2d06d9b3d3d3..25d9cd3290c0 100644 --- a/dom/security/ReferrerInfo.cpp +++ b/dom/security/ReferrerInfo.cpp @@ -322,7 +322,8 @@ nsresult ReferrerInfo::HandleUserReferrerSendingPolicy(nsIHttpChannel* aChannel, return NS_OK; } -bool ReferrerInfo::IsCrossOriginRequest(nsIHttpChannel* aChannel) const { +/* static */ +bool ReferrerInfo::IsCrossOriginRequest(nsIHttpChannel* aChannel) { nsCOMPtr<nsILoadInfo> loadInfo = aChannel->LoadInfo(); nsCOMPtr<nsIURI> triggeringURI; diff --git a/dom/security/ReferrerInfo.h b/dom/security/ReferrerInfo.h index bf21233a0510..5fa052f3f32d 100644 --- a/dom/security/ReferrerInfo.h +++ b/dom/security/ReferrerInfo.h @@ -155,7 +155,7 @@ class ReferrerInfo : public nsIReferrerInfo { * Computing whether the request is cross-origin may be expensive, so please * do that in cases where we're going to use this information later on. */ - bool IsCrossOriginRequest(nsIHttpChannel* aChannel) const; + static bool IsCrossOriginRequest(nsIHttpChannel* aChannel); /* * Check whether referrer is allowed to send in secure to insecure scenario. diff --git a/netwerk/protocol/http/nsCORSListenerProxy.cpp b/netwerk/protocol/http/nsCORSListenerProxy.cpp index 36b263ddf003..36027a5d2809 100644 --- a/netwerk/protocol/http/nsCORSListenerProxy.cpp +++ b/netwerk/protocol/http/nsCORSListenerProxy.cpp @@ -985,7 +985,7 @@ nsresult nsCORSListenerProxy::UpdateChannel(nsIChannel* aChannel, if (!currentOrgin.EqualsIgnoreCase(origin.get()) && StringEndsWith(potentialOnionHost, NS_LITERAL_CSTRING(".onion"))) { - origin.Truncate(); + origin.AssignLiteral("null"); } } diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp index d9c750dff4b0..b2c0956d0b66 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp @@ -9634,8 +9634,7 @@ void nsHttpChannel::SetOriginHeader() { nsContentUtils::GetASCIIOrigin(referrer, origin); } - // Restrict Origin to same-origin loads if requested by user or leaving from - // .onion + // Restrict Origin to same-origin loads if requested by user if (sSendOriginHeader == 1) { nsAutoCString currentOrigin; nsContentUtils::GetASCIIOrigin(mURI, currentOrigin); @@ -9643,16 +9642,14 @@ void nsHttpChannel::SetOriginHeader() { // Origin header suppressed by user setting return; } - } else if (dom::ReferrerInfo::HideOnionReferrerSource()) { + } + + if (dom::ReferrerInfo::HideOnionReferrerSource()) { nsAutoCString host; if (referrer && NS_SUCCEEDED(referrer->GetAsciiHost(host)) && - StringEndsWith(host, NS_LITERAL_CSTRING(".onion"))) { - nsAutoCString currentOrigin; - nsContentUtils::GetASCIIOrigin(mURI, currentOrigin); - if (!origin.EqualsIgnoreCase(currentOrigin.get())) { - // Origin header is suppressed by .onion - return; - } + StringEndsWith(host, NS_LITERAL_CSTRING(".onion")) && + dom::ReferrerInfo::IsCrossOriginRequest(this)) { + origin.AssignLiteral("null"); } }

1 0

[tor-browser/tor-browser-68.4.1esr-9.5-1] fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
by sysrqb＠torproject.org 06 Feb '20

06 Feb '20

commit bfe5efa2e8eaac36bc9930fa1437b1a70045532b Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Feb 5 12:29:58 2020 +0100 fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing --- .../search/extensions/disconnect/favicon.ico | Bin 1150 -> 0 bytes .../search/extensions/disconnect/manifest.json | 25 -------- browser/components/search/extensions/list.json | 68 ++++++++++----------- 3 files changed, 34 insertions(+), 59 deletions(-) diff --git a/browser/components/search/extensions/disconnect/favicon.ico b/browser/components/search/extensions/disconnect/favicon.ico deleted file mode 100644 index bffe0e17e698..000000000000 Binary files a/browser/components/search/extensions/disconnect/favicon.ico and /dev/null differ diff --git a/browser/components/search/extensions/disconnect/manifest.json b/browser/components/search/extensions/disconnect/manifest.json deleted file mode 100644 index 7f768579554f..000000000000 --- a/browser/components/search/extensions/disconnect/manifest.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "Disconnect", - "description": "Private searches using disconnect.me", - "manifest_version": 2, - "version": "1.0", - "applications": { - "gecko": { - "id": "disconnect(a)search.mozilla.org" - } - }, - "hidden": true, - "icons": { - "16": "favicon.ico" - }, - "web_accessible_resources": [ - "favicon.ico" - ], - "chrome_settings_overrides": { - "search_provider": { - "name": "Disconnect", - "search_url": "https://search.disconnect.me/searchTerms/search?ses=Google&location_option=…", - "search_url_post_params": "query={searchTerms}" - } - } -} \ No newline at end of file diff --git a/browser/components/search/extensions/list.json b/browser/components/search/extensions/list.json index 15504eacb70c..84428869d627 100644 --- a/browser/components/search/extensions/list.json +++ b/browser/components/search/extensions/list.json @@ -3,7 +3,7 @@ "searchDefault": "DuckDuckGo", "searchOrder": ["DuckDuckGo", "YouTube", "Google"], "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] }, "regionOverrides": { @@ -12,7 +12,7 @@ "en-US": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] }, "experimental-hidden": { @@ -45,7 +45,7 @@ "ar": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -134,7 +134,7 @@ "ca": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -155,7 +155,7 @@ "cs": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -169,14 +169,14 @@ "da": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, "de": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -190,7 +190,7 @@ "el": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -307,7 +307,7 @@ "es-AR": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -321,7 +321,7 @@ "es-ES": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -354,7 +354,7 @@ "fa": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -375,7 +375,7 @@ "fr": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -394,7 +394,7 @@ "ga-IE": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -429,7 +429,7 @@ "he": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -457,7 +457,7 @@ "hu": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -478,42 +478,42 @@ "id": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, "is": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, "it": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, "ja-JP-macos": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, "ja": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, "ka": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -560,7 +560,7 @@ "ko": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -609,7 +609,7 @@ "mk": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -644,7 +644,7 @@ "nb-NO": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -658,7 +658,7 @@ "nl": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] }, "experimental-hidden": { @@ -698,14 +698,14 @@ "pl": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, "pt-BR": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -726,14 +726,14 @@ "ro": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, "ru": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] }, "RU": { @@ -794,7 +794,7 @@ "sv-SE": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -829,7 +829,7 @@ "tr": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] }, "TR": { @@ -876,7 +876,7 @@ "vi": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -897,7 +897,7 @@ "zh-CN": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] }, "CN": { @@ -907,7 +907,7 @@ "zh-TW": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }

1 0

[tor-browser/tor-browser-68.4.1esr-9.5-1] fixup! Pick up latest Torbutton code
by sysrqb＠torproject.org 06 Feb '20

06 Feb '20

commit 3b2bbab2571b2179c5d4ca272fce120cc732a62e Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Feb 6 03:53:58 2020 +0000 fixup! Pick up latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index f4d81a9f8130..f87cd0af7462 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit f4d81a9f8130dd3350eae0bf967ef857308ea4d0 +Subproject commit f87cd0af7462faab1d349e28e7b17c76274624b0

1 0

[torbutton/master] Bug 31395: Remove inline script in aboutTor.xhtml
by sysrqb＠torproject.org 06 Feb '20

06 Feb '20

commit f87cd0af7462faab1d349e28e7b17c76274624b0 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Jan 14 13:14:06 2020 +0100 Bug 31395: Remove inline script in aboutTor.xhtml --- chrome.manifest | 1 + chrome/content/aboutTor/aboutTor.xhtml | 11 ++--------- chrome/content/aboutTor/resources/aboutTor.js | 11 +++++++++++ jar.mn | 1 + 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/chrome.manifest b/chrome.manifest index d1ffe6d6..6d9d12d4 100644 --- a/chrome.manifest +++ b/chrome.manifest @@ -1,5 +1,6 @@ content torbutton chrome/content/ resource torbutton ./ +resource torbutton-abouttor resource://torbutton/content/aboutTor/resources/ contentaccessible=yes resource torbutton-assets resource://torbutton/chrome/skin/ contentaccessible=yes # browser branding diff --git a/chrome/content/aboutTor/aboutTor.xhtml b/chrome/content/aboutTor/aboutTor.xhtml index 56777ba3..db313c3d 100644 --- a/chrome/content/aboutTor/aboutTor.xhtml +++ b/chrome/content/aboutTor/aboutTor.xhtml @@ -20,19 +20,12 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <meta http-equiv="Content-Security-Policy" content="default-src chrome: resource:; script-src chrome: resource: 'unsafe-inline';" /> + <meta http-equiv="Content-Security-Policy" content="default-src resource:;" /> <meta name="viewport" content="width=device-width, initial-scale=1"/> <title>&aboutTor.title;</title> <link rel="stylesheet" type="text/css" media="all" href="resource://torbutton-assets/aboutTor.css"/> -<script type="text/javascript"> - <![CDATA[ -window.addEventListener("pageshow", function() { - let evt = new CustomEvent("AboutTorLoad", { bubbles: true }); - document.dispatchEvent(evt); -}); -]]> -</script> + <script type="text/javascript" src="resource://torbutton-abouttor/aboutTor.js"></script> </head> <body dir="&locale.dir;"> <div class="torcontent-container"> diff --git a/chrome/content/aboutTor/resources/aboutTor.js b/chrome/content/aboutTor/resources/aboutTor.js new file mode 100644 index 00000000..6687390b --- /dev/null +++ b/chrome/content/aboutTor/resources/aboutTor.js @@ -0,0 +1,11 @@ +/************************************************************************* + * Copyright (c) 2020, The Tor Project, Inc. + * See LICENSE for licensing information. + * + * vim: set sw=2 sts=2 ts=8 et syntax=javascript: + *************************************************************************/ + +window.addEventListener("pageshow", function() { + let evt = new CustomEvent("AboutTorLoad", { bubbles: true }); + document.dispatchEvent(evt); +}); diff --git a/jar.mn b/jar.mn index 45c8c9b8..3838bc9b 100644 --- a/jar.mn +++ b/jar.mn @@ -10,6 +10,7 @@ torbutton.jar: skin/ (chrome/skin/*) % resource torbutton % +% resource torbutton-abouttor resource://torbutton/content/aboutTor/resources/ contentaccessible=yes % resource torbutton-assets resource://torbutton/skin/ contentaccessible=yes # browser branding

1 0

[tor-browser-build/master] Move OpenPGP keys under Build System in Changelog
by sysrqb＠torproject.org 05 Feb '20

05 Feb '20

commit fbad74f0a5f743a031683420426983ab99a97835 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Feb 4 20:40:00 2020 +0000 Move OpenPGP keys under Build System in Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index a123447..ad3cc9d 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -3,7 +3,6 @@ Tor Browser 9.5a4 -- January 10 2020 * Update Firefox to 68.4.1esr * Bump NoScript to 11.0.11 * Translations update - * Update OpenPGP keyring * Bug 31134: Govern graphite again by security settings * Bug 31855: Remove End of Year Fundraising Campaign from about:tor * Bug 32053: Fix LLVM reproducibility issues @@ -17,6 +16,7 @@ Tor Browser 9.5a4 -- January 10 2020 * Bug 32674: Point the about:tor "Get involved" link to the community portal * Build System * All Platforms + * Update OpenPGP keyring * Bug 32739: Bump clang to 8.0.1 * Linux * Bug 32676: Create a tarball with all Linux x86_64 language packs @@ -30,7 +30,6 @@ Tor Browser 9.0.3 -- January 7 2020 * Update Firefox to 68.4.0esr * Bump NoScript to 11.0.11 * Translations update - * Update OpenPGP keyring * Bug 32606: Set up default bridge at Georgetown University * Bug 32659: Remove IPv6 address of default bridge * Bug 32547: Add new default bridge at UMN @@ -42,6 +41,8 @@ Tor Browser 9.0.3 -- January 7 2020 * Android * Bug 32405: Crash immediately after bootstrap on Android * Build System + * All Platforms + * Update OpenPGP keyring * Linux * Bug 32676: Create a tarball with all Linux x86_64 language packs

1 0

[tor-browser-build/master] Bump tor alpha version
by sysrqb＠torproject.org 05 Feb '20

05 Feb '20

commit 9f9deebd2327555c6afbfa9e0a83a2b6f94ff9a3 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Feb 5 00:09:20 2020 +0000 Bump tor alpha version --- projects/tor/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor/config b/projects/tor/config index 4a1045c..c1c41a6 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.4.2.5 +version: 0.4.3.1-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1

1 0

[tor-browser-build/master] Bug 32891: Pick up new default bridge
by sysrqb＠torproject.org 05 Feb '20

05 Feb '20

commit 0d50bcb46dc0ec08c7076d26da3eb561ba10d6b1 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Feb 5 00:30:06 2020 +0000 Bug 32891: Pick up new default bridge --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index d7a5882..ca68d7b 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 4a81e5806f36e7d0bf9492437d824599ecf4ff43 +git_hash: 18ba7d2780b1d5194cc5854d703655f6c9d3d196 git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-browser-build/master] Bug 32768: Create a build-infos.json file
by sysrqb＠torproject.org 05 Feb '20

05 Feb '20

commit 50b8b9db82bbf84713b3af0bbe27d06a729642ab Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 16 18:57:22 2019 +0100 Bug 32768: Create a build-infos.json file Create a file containing firefox platformVersion and buildID. --- projects/firefox/build | 9 +++++++++ projects/tor-browser/build | 3 +++ rbm.conf | 1 + 3 files changed, 13 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index 22c5b5d..c334854 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -273,3 +273,12 @@ END; zip_src => [ 'mar-tools' ], zip_args => dest_dir _ '/' _ c('filename') _ '/' _ c('var/martools_filename'), }) %] + +[% IF c("var/build_infos_json") -%] + cat > "[% dest_dir _ '/' _ c('filename') _ '/build-infos.json' %]" << EOF_BUILDINFOS + { + "firefox_platform_version" : "[% c("var/firefox_platform_version") %]", + "firefox_buildid" : "$MOZ_BUILD_DATE" + } +EOF_BUILDINFOS +[% END -%] diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 4d44f12..2633ddc 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -297,6 +297,9 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% IF c("var/linux") -%] cp $rootdir/[% c('input_files_by_name/tor') %]/tor-debug.tar.xz "$OUTDIR"/tor-[% c("var/mar_osname") %]-debug.tar.xz [% END -%] +[% IF c("var/build_infos_json") -%] + cp $rootdir/[% c('input_files_by_name/firefox') %]/build-infos.json "$OUTDIR"/build-infos-[% c("var/mar_osname") %].json +[% END -%] # Create a tarball with all Linux x86_64 language packs (Bug 32676) [% IF c("var/release") && c("var/linux-x86_64") && ! c("var/multi_lingual") && ! c("var/testbuild") -%] diff --git a/rbm.conf b/rbm.conf index f0e22a8..77c6e4a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -158,6 +158,7 @@ targets: - fr - ru max_torbrowser_incremental_from: 2 + build_infos_json: 1 torbrowser-testbuild: - testbuild

1 0

[tor-android-service/master] Merge remote-tracking branch 'phwgh/task/32891'
by sysrqb＠torproject.org 05 Feb '20

05 Feb '20

commit 18ba7d2780b1d5194cc5854d703655f6c9d3d196 Merge: 4a81e58 694ef51 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Feb 5 00:28:58 2020 +0000 Merge remote-tracking branch 'phwgh/task/32891' service/src/main/assets/common/bridges.txt | 2 ++ 1 file changed, 2 insertions(+) diff --cc service/src/main/assets/common/bridges.txt index adc6b8c,5e3227d..7c1ebcf --- a/service/src/main/assets/common/bridges.txt +++ b/service/src/main/assets/common/bridges.txt @@@ -10,5 -10,6 +10,7 @@@ obfs4 193.11.166.194:27015 2D82C2E354D5 obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0 obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0 obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0 +obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0 + obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0 + obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0 meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com

1 0

[tor-android-service/master] Bug 32891: Add new IPv4/IPv6 default bridge.
by sysrqb＠torproject.org 05 Feb '20

05 Feb '20

commit 694ef51f3a59c39c74bd22d1a1ee48f4b91d235f Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Jan 8 15:54:38 2020 +0100 Bug 32891: Add new IPv4/IPv6 default bridge. Toke Høiland-Jørgensen generously offered to set up a default bridge in Denmark. This fixes <https://bugs.torproject.org/32891>. --- service/src/main/assets/common/bridges.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/service/src/main/assets/common/bridges.txt b/service/src/main/assets/common/bridges.txt index 36ed076..5e3227d 100644 --- a/service/src/main/assets/common/bridges.txt +++ b/service/src/main/assets/common/bridges.txt @@ -10,4 +10,6 @@ obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJr obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0 obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0 obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0 +obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0 +obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0 meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com

1 0

[tor-launcher/master] Bug 30237: Add v3 onion services client authentication prompt
by sysrqb＠torproject.org 05 Feb '20

05 Feb '20

commit 8726dc9a06524edc03d053a3258652dd9337ef78 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Nov 18 09:50:28 2019 -0500 Bug 30237: Add v3 onion services client authentication prompt Enable Tor's SOCKS extended error code feature by including ExtendedErrors in the socks port flags. --- src/defaults/preferences/torlauncher-prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/defaults/preferences/torlauncher-prefs.js b/src/defaults/preferences/torlauncher-prefs.js index 55fe38c..472b763 100644 --- a/src/defaults/preferences/torlauncher-prefs.js +++ b/src/defaults/preferences/torlauncher-prefs.js @@ -38,7 +38,7 @@ pref("extensions.torlauncher.control_ipc_path", ""); // careful). pref("extensions.torlauncher.socks_port_use_ipc", false); pref("extensions.torlauncher.socks_ipc_path", ""); -pref("extensions.torlauncher.socks_port_flags", "IPv6Traffic PreferIPv6 KeepAliveIsolateSOCKSAuth"); +pref("extensions.torlauncher.socks_port_flags", "ExtendedErrors IPv6Traffic PreferIPv6 KeepAliveIsolateSOCKSAuth"); // The tor_path is relative to the application directory. On Linux and // Windows this is the Browser/ directory that contains the firefox

1 0

[tor-browser/tor-browser-68.4.1esr-9.5-1] Bug 30237: Add v3 onion services client authentication prompt
by sysrqb＠torproject.org 05 Feb '20

05 Feb '20

commit 6cac185d0c10e4f26ca7eaf000c31fae36d13bfc Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Nov 12 16:11:05 2019 -0500 Bug 30237: Add v3 onion services client authentication prompt When Tor informs the browser that client authentication is needed, temporarily load about:blank instead of about:neterror and prompt for the user's key. If a correctly formatted key is entered, use Tor's ONION_CLIENT_AUTH_ADD control port command to add the key (via Torbutton's control port module) and reload the page. If the user cancels the prompt, display the standard about:neterror "Unable to connect" page. This requires a small change to browser/actors/NetErrorChild.jsm to account for the fact that the docShell no longer has the failedChannel information. The failedChannel is used to extract TLS-related error info, which is not applicable in the case of a canceled .onion authentication prompt. Add a leaveOpen option to PopupNotifications.show so we can display error messages within the popup notification doorhanger without closing the prompt. Add support for onion services strings to the TorStrings module. Add support for Tor extended SOCKS errors (Tor proposal 304) to the socket transport and SOCKS layers. Improved display of all of these errors will be implemented as part of bug 30025. --- browser/actors/NetErrorChild.jsm | 2 +- browser/base/content/browser.js | 10 + browser/base/content/browser.xul | 3 + browser/base/content/tab-content.js | 5 + browser/components/moz.build | 1 + .../content/authNotificationIcon.inc.xul | 6 + .../onionservices/content/authPopup.inc.xul | 14 + .../components/onionservices/content/authPrompt.js | 290 +++++++++++++++++++++ .../components/onionservices/content/authUtil.jsm | 32 +++ .../onionservices/content/onionservices.css | 69 +++++ browser/components/onionservices/jar.mn | 4 + browser/components/onionservices/moz.build | 1 + browser/modules/TorStrings.jsm | 74 +++++- browser/themes/shared/notification-icons.inc.css | 3 + docshell/base/nsDocShell.cpp | 62 +++++ dom/ipc/BrowserParent.cpp | 23 ++ dom/ipc/BrowserParent.h | 3 + dom/ipc/PBrowser.ipdl | 8 + js/xpconnect/src/xpc.msg | 8 + netwerk/base/nsSocketTransport2.cpp | 6 + netwerk/socket/nsSOCKSIOLayer.cpp | 30 +++ toolkit/modules/PopupNotifications.jsm | 6 + xpcom/base/ErrorList.py | 18 ++ 23 files changed, 672 insertions(+), 6 deletions(-) diff --git a/browser/actors/NetErrorChild.jsm b/browser/actors/NetErrorChild.jsm index 173a93ad5f29..7834f7168a42 100644 --- a/browser/actors/NetErrorChild.jsm +++ b/browser/actors/NetErrorChild.jsm @@ -840,7 +840,7 @@ class NetErrorChild extends ActorChild { } if (this.isAboutNetError(win.document)) { let docShell = win.docShell; - if (docShell) { + if (docShell && docShell.failedChannel) { let { securityInfo } = docShell.failedChannel; // We don't have a securityInfo when this is for example a DNS error. if (securityInfo) { diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index b213d72551fc..11857f16b8e9 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -216,6 +216,11 @@ XPCOMUtils.defineLazyScriptGetter( ); XPCOMUtils.defineLazyScriptGetter( this, + ["OnionAuthPrompt"], + "chrome://browser/content/onionservices/authPrompt.js" +); +XPCOMUtils.defineLazyScriptGetter( + this, "gEditItemOverlay", "chrome://browser/content/places/editBookmark.js" ); @@ -1855,6 +1860,9 @@ var gBrowserInit = { // Init the SecuritySettingsButton SecurityLevelButton.init(); + // Init the OnionAuthPrompt + OnionAuthPrompt.init(); + // Certain kinds of automigration rely on this notification to complete // their tasks BEFORE the browser window is shown. SessionStore uses it to // restore tabs into windows AFTER important parts like gMultiProcessBrowser @@ -2488,6 +2496,8 @@ var gBrowserInit = { SecurityLevelButton.uninit(); + OnionAuthPrompt.uninit(); + gAccessibilityServiceIndicator.uninit(); AccessibilityRefreshBlocker.uninit(); diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul index 8e47fd36fb75..d2f72eea8edb 100644 --- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -33,6 +33,7 @@ <?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css" type="text/css"?> <?xml-stylesheet href="chrome://torbutton/skin/tor-circuit-display.css" type="text/css"?> <?xml-stylesheet href="chrome://torbutton/skin/torbutton.css" type="text/css"?> +<?xml-stylesheet href="chrome://browser/content/onionservices/onionservices.css" type="text/css"?> # All DTD information is stored in a separate file so that it can be shared by # hiddenWindow.xul. @@ -623,6 +624,7 @@ #include ../../components/controlcenter/content/protectionsPanel.inc.xul #include ../../components/downloads/content/downloadsPanel.inc.xul #include ../../components/securitylevel/content/securityLevelPanel.inc.xul +#include ../../components/onionservices/content/authPopup.inc.xul #include browser-allTabsMenu.inc.xul <hbox id="downloads-animation-container" mousethrough="always"> @@ -922,6 +924,7 @@ tooltiptext="&urlbar.indexedDBNotificationAnchor.tooltip;"/> <image id="password-notification-icon" class="notification-anchor-icon login-icon" role="button" tooltiptext="&urlbar.passwordNotificationAnchor.tooltip;"/> +#include ../../components/onionservices/content/authNotificationIcon.inc.xul <stack id="plugins-notification-icon" class="notification-anchor-icon" role="button" align="center" tooltiptext="&urlbar.pluginsNotificationAnchor.tooltip;"> <image class="plugin-icon" /> diff --git a/browser/base/content/tab-content.js b/browser/base/content/tab-content.js index 57f3925a1ca5..14311242f5d1 100644 --- a/browser/base/content/tab-content.js +++ b/browser/base/content/tab-content.js @@ -19,6 +19,9 @@ ChromeUtils.defineModuleGetter( "BrowserUtils", "resource://gre/modules/BrowserUtils.jsm" ); +var { OnionAuthUtil } = ChromeUtils.import( + "chrome://browser/content/onionservices/authUtil.jsm" +); var { ActorManagerChild } = ChromeUtils.import( "resource://gre/modules/ActorManagerChild.jsm" @@ -118,3 +121,5 @@ addEventListener("MozAfterPaint", function onFirstNonBlankPaint() { removeEventListener("MozAfterPaint", onFirstNonBlankPaint); sendAsyncMessage("Browser:FirstNonBlankPaint"); }); + +OnionAuthUtil.addCancelMessageListener(this, docShell); diff --git a/browser/components/moz.build b/browser/components/moz.build index c0c9629cac65..3331a51fbe88 100644 --- a/browser/components/moz.build +++ b/browser/components/moz.build @@ -42,6 +42,7 @@ DIRS += [ 'library', 'migration', 'newtab', + 'onionservices', 'originattributes', 'places', 'pocket', diff --git a/browser/components/onionservices/content/authNotificationIcon.inc.xul b/browser/components/onionservices/content/authNotificationIcon.inc.xul new file mode 100644 index 000000000000..91274d612739 --- /dev/null +++ b/browser/components/onionservices/content/authNotificationIcon.inc.xul @@ -0,0 +1,6 @@ +# Copyright (c) 2020, The Tor Project, Inc. + +<image id="tor-clientauth-notification-icon" + class="notification-anchor-icon tor-clientauth-icon" + role="button" + tooltiptext="&torbutton.onionServices.authPrompt.tooltip;"/> diff --git a/browser/components/onionservices/content/authPopup.inc.xul b/browser/components/onionservices/content/authPopup.inc.xul new file mode 100644 index 000000000000..d327e4c6a88d --- /dev/null +++ b/browser/components/onionservices/content/authPopup.inc.xul @@ -0,0 +1,14 @@ +# Copyright (c) 2020, The Tor Project, Inc. + +<popupnotification id="tor-clientauth-notification" hidden="true"> + <popupnotificationcontent orient="vertical"> + <description id="tor-clientauth-notification-desc"/> + <label id="tor-clientauth-notification-learnmore" + class="text-link popup-notification-learnmore-link" + is="text-link"/> + <html:div> + <html:input id="tor-clientauth-notification-key" type="password"/> + <html:div id="tor-clientauth-warning"/> + </html:div> + </popupnotificationcontent> +</popupnotification> diff --git a/browser/components/onionservices/content/authPrompt.js b/browser/components/onionservices/content/authPrompt.js new file mode 100644 index 000000000000..2d4ebcafd688 --- /dev/null +++ b/browser/components/onionservices/content/authPrompt.js @@ -0,0 +1,290 @@ +// Copyright (c) 2020, The Tor Project, Inc. + +"use strict"; + +XPCOMUtils.defineLazyModuleGetters(this, { + OnionAuthUtil: "chrome://browser/content/onionservices/authUtil.jsm", + CommonUtils: "resource://services-common/utils.js", + TorStrings: "resource:///modules/TorStrings.jsm", +}); + +const OnionAuthPrompt = (function() { + // OnionServicesAuthPrompt objects run within the main/chrome process. + function OnionServicesAuthPrompt(aBrowser, aFailedURI, aOnionName) { + this._browser = aBrowser; + this._failedURI = aFailedURI; + this._onionName = aOnionName; + } + + OnionServicesAuthPrompt.prototype = { + show(aWarningMessage) { + let mainAction = { + label: TorStrings.onionServices.authPrompt.done, + accessKey: TorStrings.onionServices.authPrompt.doneAccessKey, + leaveOpen: true, // Callback is responsible for closing the notification. + callback: this._onDone.bind(this), + }; + + let dialogBundle = Services.strings.createBundle( + "chrome://global/locale/dialog.properties"); + + let cancelAccessKey = dialogBundle.GetStringFromName("accesskey-cancel"); + if (!cancelAccessKey) + cancelAccessKey = "c"; // required by PopupNotifications.show() + + let cancelAction = { + label: dialogBundle.GetStringFromName("button-cancel"), + accessKey: cancelAccessKey, + callback: this._onCancel.bind(this), + }; + + let _this = this; + let options = { + autofocus: true, + hideClose: true, + persistent: true, + removeOnDismissal: false, + eventCallback(aTopic) { + if (aTopic === "showing") { + _this._onPromptShowing(aWarningMessage); + } else if (aTopic === "shown") { + _this._onPromptShown(); + } else if (aTopic === "removed") { + _this._onPromptRemoved(); + } + } + }; + + this._prompt = PopupNotifications.show(this._browser, + OnionAuthUtil.string.notificationID, "", + OnionAuthUtil.string.anchorID, + mainAction, [cancelAction], options); + }, + + _onPromptShowing(aWarningMessage) { + let xulDoc = this._browser.ownerDocument; + let descElem = xulDoc.getElementById(OnionAuthUtil.string.descriptionID); + if (descElem) { + // Handle replacement of the onion name within the localized + // string ourselves so we can show the onion name as bold text. + // We do this by splitting the localized string and creating + // several HTML <span> elements. + while (descElem.firstChild) + descElem.removeChild(descElem.firstChild); + + let fmtString = TorStrings.onionServices.authPrompt.description; + let prefix = ""; + let suffix = ""; + const kToReplace = "%S"; + let idx = fmtString.indexOf(kToReplace); + if (idx < 0) { + prefix = fmtString; + } else { + prefix = fmtString.substring(0, idx); + suffix = fmtString.substring(idx + kToReplace.length); + } + + const kHTMLNS = "http://www.w3.org/1999/xhtml"; + let span = xulDoc.createElementNS(kHTMLNS, "span"); + span.textContent = prefix; + descElem.appendChild(span); + span = xulDoc.createElementNS(kHTMLNS, "span"); + span.id = OnionAuthUtil.string.onionNameSpanID; + span.textContent = this._onionName; + descElem.appendChild(span); + span = xulDoc.createElementNS(kHTMLNS, "span"); + span.textContent = suffix; + descElem.appendChild(span); + } + + // Set "Learn More" label and href. + let learnMoreElem = xulDoc.getElementById(OnionAuthUtil.string.learnMoreID); + if (learnMoreElem) { + learnMoreElem.setAttribute("value", TorStrings.onionServices.learnMore); + learnMoreElem.setAttribute("href", TorStrings.onionServices.learnMoreURL); + } + + this._showWarning(aWarningMessage); + }, + + _onPromptShown() { + let keyElem = this._getKeyElement(); + if (keyElem) { + keyElem.setAttribute("placeholder", + TorStrings.onionServices.authPrompt.keyPlaceholder); + this._boundOnKeyFieldKeyPress = this._onKeyFieldKeyPress.bind(this); + this._boundOnKeyFieldInput = this._onKeyFieldInput.bind(this); + keyElem.addEventListener("keypress", this._boundOnKeyFieldKeyPress); + keyElem.addEventListener("input", this._boundOnKeyFieldInput); + keyElem.focus(); + } + }, + + _onPromptRemoved() { + if (this._boundOnKeyFieldKeyPress) { + let keyElem = this._getKeyElement(); + if (keyElem) { + keyElem.value = ""; + keyElem.removeEventListener("keypress", + this._boundOnKeyFieldKeyPress); + this._boundOnKeyFieldKeyPress = undefined; + keyElem.removeEventListener("input", this._boundOnKeyFieldInput); + this._boundOnKeyFieldInput = undefined; + } + } + }, + + _onKeyFieldKeyPress(aEvent) { + if (aEvent.keyCode == aEvent.DOM_VK_RETURN) { + this._onDone(); + } else if (aEvent.keyCode == aEvent.DOM_VK_ESCAPE) { + this._prompt.remove(); + this._onCancel(); + } + }, + + _onKeyFieldInput(aEvent) { + this._showWarning(undefined); // Remove the warning. + }, + + _onDone() { + let keyElem = this._getKeyElement(); + if (!keyElem) + return; + + let base64key = this._keyToBase64(keyElem.value); + if (!base64key) { + this._showWarning(TorStrings.onionServices.authPrompt.invalidKey); + return; + } + + this._prompt.remove(); + + // Use Torbutton's controller module to add the private key to Tor. + let controllerFailureMsg = + TorStrings.onionServices.authPrompt.failedToSetKey; + try { + let { controller } = + Cu.import("resource://torbutton/modules/tor-control-port.js", {}); + let torController = controller(aError => { + this.show(controllerFailureMsg); + }); + let onionAddr = this._onionName.toLowerCase().replace(/\.onion$/, ""); + torController.onionAuthAdd(onionAddr, base64key) + .then(aResponse => { + // Success! Reload the page. + this._browser.messageManager.sendAsyncMessage("Browser:Reload", {}); + }) + .catch(aError => { + if (aError.torMessage) + this.show(aError.torMessage); + else + this.show(controllerFailureMsg); + }); + } catch (e) { + this.show(controllerFailureMsg); + } + }, + + _onCancel() { + // Arrange for an error page to be displayed. + this._browser.messageManager.sendAsyncMessage( + OnionAuthUtil.string.authPromptCanceledMessage, + {failedURI: this._failedURI.spec}); + }, + + _getKeyElement() { + let xulDoc = this._browser.ownerDocument; + return xulDoc.getElementById(OnionAuthUtil.string.keyElementID); + }, + + _showWarning(aWarningMessage) { + let xulDoc = this._browser.ownerDocument; + let warningElem = + xulDoc.getElementById(OnionAuthUtil.string.warningElementID); + let keyElem = this._getKeyElement(); + if (warningElem) { + if (aWarningMessage) { + warningElem.textContent = aWarningMessage; + warningElem.removeAttribute("hidden"); + if (keyElem) + keyElem.className = "invalid"; + } else { + warningElem.setAttribute("hidden", "true"); + if (keyElem) + keyElem.className = ""; + } + } + }, + + // Returns undefined if the key is the wrong length or format. + _keyToBase64(aKeyString) { + if (!aKeyString) + return undefined; + + let base64key; + if (aKeyString.length == 52) { + // The key is probably base32-encoded. Attempt to decode. + let rawKey; + try { + rawKey = CommonUtils.decodeBase32(aKeyString); + } catch (e) {} + + if (rawKey) try { + base64key = btoa(rawKey); + } catch (e) {} + } else if ((aKeyString.length == 44) && + /^[a-zA-Z0-9+/]*=*$/.test(aKeyString)) { + // The key appears to be a correctly formatted base64 value. If not, + // tor will return an error when we try to add the key via the + // control port. + base64key = aKeyString; + } + + return base64key; + }, + }; + + let retval = { + init() { + Services.obs.addObserver(this, OnionAuthUtil.string.authPromptTopic); + }, + + uninit() { + Services.obs.removeObserver(this, OnionAuthUtil.string.authPromptTopic); + }, + + // aSubject is the DOM Window or browser where the prompt should be shown. + // aData contains the .onion name. + observe(aSubject, aTopic, aData) { + if (aTopic != OnionAuthUtil.string.authPromptTopic) { + return; + } + + let browser; + if (aSubject instanceof Ci.nsIDOMWindow) { + let contentWindow = aSubject.QueryInterface(Ci.nsIDOMWindow); + browser = contentWindow.docShell.chromeEventHandler; + } else { + browser = aSubject.QueryInterface(Ci.nsIBrowser); + } + + if (!gBrowser.browsers.some(aBrowser => aBrowser == browser)) { + return; // This window does not contain the subject browser; ignore. + } + + let failedURI = browser.currentURI; + let authPrompt = new OnionServicesAuthPrompt(browser, failedURI, aData); + authPrompt.show(undefined); + } + }; + + return retval; +})(); /* OnionAuthPrompt */ + + +Object.defineProperty(this, "OnionAuthPrompt", { + value: OnionAuthPrompt, + enumerable: true, + writable: false +}); diff --git a/browser/components/onionservices/content/authUtil.jsm b/browser/components/onionservices/content/authUtil.jsm new file mode 100644 index 000000000000..8547fba83a62 --- /dev/null +++ b/browser/components/onionservices/content/authUtil.jsm @@ -0,0 +1,32 @@ +// Copyright (c) 2020, The Tor Project, Inc. + +"use strict"; + +var EXPORTED_SYMBOLS = [ + "OnionAuthUtil", +]; + +var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); + +const OnionAuthUtil = { + string: { + authPromptTopic: "tor-onion-services-auth-prompt", + authPromptCanceledMessage: "Tor:OnionServicesAuthPromptCanceled", + anchorID: "tor-clientauth-notification-icon", + notificationID: "tor-clientauth", + descriptionID: "tor-clientauth-notification-desc", + learnMoreID: "tor-clientauth-notification-learnmore", + onionNameSpanID: "tor-clientauth-notification-onionname", + keyElementID: "tor-clientauth-notification-key", + warningElementID: "tor-clientauth-warning", + }, + + addCancelMessageListener(aTabContent, aDocShell) { + aTabContent.addMessageListener(this.string.authPromptCanceledMessage, + (aMessage) => { + let failedURI = Services.io.newURI(aMessage.data.failedURI); + aDocShell.displayLoadError(Cr.NS_ERROR_CONNECTION_REFUSED, failedURI, + undefined, undefined); + }); + }, +}; diff --git a/browser/components/onionservices/content/onionservices.css b/browser/components/onionservices/content/onionservices.css new file mode 100644 index 000000000000..e2621ec8266d --- /dev/null +++ b/browser/components/onionservices/content/onionservices.css @@ -0,0 +1,69 @@ +/* Copyright (c) 2020, The Tor Project, Inc. */ + +@namespace html url("http://www.w3.org/1999/xhtml"); + +html|*#tor-clientauth-notification-onionname { + font-weight: bold; +} + +html|*#tor-clientauth-notification-key { + box-sizing: border-box; + width: 100%; + margin-top: 15px; + padding: 6px; +} + +/* Start of rules adapted from + * browser/components/newtab/css/activity-stream-mac.css (linux and windows + * use the same rules). + */ +html|*#tor-clientauth-notification-key.invalid { + border: 1px solid #D70022; + box-shadow: 0 0 0 1px #D70022, 0 0 0 4px rgba(215, 0, 34, 0.3); +} + +html|*#tor-clientauth-warning { + display: inline-block; + animation: fade-up-tt 450ms; + background: #D70022; + border-radius: 2px; + color: #FFF; + inset-inline-start: 3px; + padding: 5px 12px; + position: relative; + top: 6px; + z-index: 1; +} + +html|*#tor-clientauth-warning[hidden] { + display: none; +} + +html|*#tor-clientauth-warning::before { + background: #D70022; + bottom: -8px; + content: '.'; + height: 16px; + inset-inline-start: 12px; + position: absolute; + text-indent: -999px; + top: -7px; + transform: rotate(45deg); + white-space: nowrap; + width: 16px; + z-index: -1; +} + +@keyframes fade-up-tt { + 0% { + opacity: 0; + transform: translateY(15px); + } + 100% { + opacity: 1; + transform: translateY(0); + } +} +/* End of rules adapted from + * browser/components/newtab/css/activity-stream-mac.css + */ diff --git a/browser/components/onionservices/jar.mn b/browser/components/onionservices/jar.mn new file mode 100644 index 000000000000..06cf2df6e7ac --- /dev/null +++ b/browser/components/onionservices/jar.mn @@ -0,0 +1,4 @@ +browser.jar: + content/browser/onionservices/authPrompt.js (content/authPrompt.js) + content/browser/onionservices/authUtil.jsm (content/authUtil.jsm) + content/browser/onionservices/onionservices.css (content/onionservices.css) diff --git a/browser/components/onionservices/moz.build b/browser/components/onionservices/moz.build new file mode 100644 index 000000000000..7e103239c8d6 --- /dev/null +++ b/browser/components/onionservices/moz.build @@ -0,0 +1 @@ +JAR_MANIFESTS += ['jar.mn'] diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm index 0b682ceeeb83..f68d60cf1343 100644 --- a/browser/modules/TorStrings.jsm +++ b/browser/modules/TorStrings.jsm @@ -5,6 +5,9 @@ var EXPORTED_SYMBOLS = ["TorStrings"]; const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); +const { Services } = ChromeUtils.import( + "resource://gre/modules/Services.jsm" +); const { getLocale } = ChromeUtils.import( "resource://torbutton/modules/utils.js" ); @@ -17,11 +20,11 @@ XPCOMUtils.defineLazyGetter(this, "domParser", () => { }); /* - Tor String Bundle + Tor DTD String Bundle - Strings loaded from torbutton/tor-launcher, but provide a fallback in case they aren't available + DTD strings loaded from torbutton/tor-launcher, but provide a fallback in case they aren't available */ -class TorStringBundle { +class TorDTDStringBundle { constructor(aBundleURLs, aPrefix) { let locations = []; for (const [index, url] of aBundleURLs.entries()) { @@ -65,6 +68,36 @@ class TorStringBundle { } /* + Tor Property String Bundle + + Property strings loaded from torbutton/tor-launcher, but provide a fallback in case they aren't available +*/ +class TorPropertyStringBundle { + constructor(aBundleURL, aPrefix) { + try { + this._bundle = Services.strings.createBundle(aBundleURL); + } catch (e) {} + + this._prefix = aPrefix; + } + + getString(key, fallback) { + if (key) { + try { + return this._bundle.GetStringFromName(`${this._prefix}${key}`); + } catch (e) {} + } + + // on failure, assign the fallback if it exists + if (fallback) { + return fallback; + } + // otherwise return string key + return `$(${key})`; + } +} + +/* Security Level Strings */ var TorStrings = { @@ -72,7 +105,7 @@ var TorStrings = { Tor Browser Security Level Strings */ securityLevel: (function() { - let tsb = new TorStringBundle( + let tsb = new TorDTDStringBundle( ["chrome://torbutton/locale/torbutton.dtd"], "torbutton.prefs.sec_" ); @@ -157,7 +190,7 @@ var TorStrings = { Tor about:preferences#tor Strings */ settings: (function() { - let tsb = new TorStringBundle( + let tsb = new TorDTDStringBundle( ["chrome://torlauncher/locale/network-settings.dtd"], "" ); @@ -284,6 +317,37 @@ var TorStrings = { })() /* Tor Network Settings Strings */, /* + Tor Onion Services Strings, e.g., for the authentication prompt. + */ + onionServices: (function() { + let tsb = new TorPropertyStringBundle( + "chrome://torbutton/locale/torbutton.properties", + "onionServices." + ); + let getString = function(key, fallback) { + return tsb.getString(key, fallback); + }; + + let retval = { + learnMore: getString("torPreferences.learnMore", "Learn More"), + learnMoreURL: `https://2019.www.torproject.org/docs/tor-manual-dev.html.${getLocale()}#_client_authorization`, + authPrompt: { + description: + getString("authPrompt.description", "%S is requesting your private key."), + keyPlaceholder: getString("authPrompt.keyPlaceholder", "Enter your key"), + done: getString("authPrompt.done", "Done"), + doneAccessKey: getString("authPrompt.doneAccessKey", "d"), + invalidKey: getString("authPrompt.invalidKey", "Invalid key"), + failedToSetKey: + getString("authPrompt.failedToSetKey", "Failed to set key"), + }, + }; + + return retval; + })() /* Tor Onion Services Strings */, + + + /* Tor Deamon Configuration Key Strings */ diff --git a/browser/themes/shared/notification-icons.inc.css b/browser/themes/shared/notification-icons.inc.css index 6d461a89488c..d35f292a0860 100644 --- a/browser/themes/shared/notification-icons.inc.css +++ b/browser/themes/shared/notification-icons.inc.css @@ -113,6 +113,9 @@ list-style-image: url(chrome://browser/skin/notification-icons/indexedDB.svg); } +/* Reuse Firefox's login (key) icon for the Tor onion services auth. prompt */ +.popup-notification-icon[popupid="tor-clientauth"], +.tor-clientauth-icon, .popup-notification-icon[popupid="password"], .login-icon { list-style-image: url(chrome://browser/skin/login.svg); diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 3cf2086206a4..cc329a50c109 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -4363,6 +4363,26 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI, // HTTP/2 stack detected a protocol error error = "networkProtocolError"; break; + case NS_ERROR_TOR_ONION_SVC_NOT_FOUND: + case NS_ERROR_TOR_ONION_SVC_IS_INVALID: + case NS_ERROR_TOR_ONION_SVC_INTRO_FAILED: + case NS_ERROR_TOR_ONION_SVC_REND_FAILED: + // For now, handle these Tor onion service errors the same as + // NS_ERROR_CONNECTION_REFUSED. + NS_ENSURE_ARG_POINTER(aURI); + addHostPort = true; + error = "connectionFailure"; + break; + case NS_ERROR_TOR_ONION_SVC_BAD_CLIENT_AUTH: + // For now, we let this fall through but it should be handled in + // a special way, e.g., tell the user in our auth prompt that the + // key they provided was bad. This will be done as part of #30025. + MOZ_FALLTHROUGH; + case NS_ERROR_TOR_ONION_SVC_MISSING_CLIENT_AUTH: + error = "onionServices.clientAuthMissing"; + // Display about:blank while the Tor client auth prompt is open. + errorPage.AssignLiteral("blank"); + break; default: break; } @@ -4442,6 +4462,20 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI, nsAutoString str; rv = stringBundle->FormatStringFromName(errorDescriptionID, strs, formatStrCount, str); + if (NS_FAILED(rv)) { + // As a fallback, check torbutton.properties for the error string. + const char bundleURL[] = "chrome://torbutton/locale/torbutton.properties"; + nsCOMPtr<nsIStringBundleService> stringBundleService = + mozilla::services::GetStringBundleService(); + if (stringBundleService) { + nsCOMPtr<nsIStringBundle> tbStringBundle; + if (NS_SUCCEEDED(stringBundleService->CreateBundle(bundleURL, + getter_AddRefs(tbStringBundle)))) { + rv = tbStringBundle->FormatStringFromName(errorDescriptionID, strs, + formatStrCount, str); + } + } + } NS_ENSURE_SUCCESS(rv, rv); messageStr.Assign(str.get()); } @@ -6964,6 +6998,7 @@ nsresult nsDocShell::EndPageLoad(nsIWebProgress* aProgress, aStatus == NS_ERROR_INTERCEPTION_FAILED || aStatus == NS_ERROR_NET_INADEQUATE_SECURITY || aStatus == NS_ERROR_NET_HTTP2_SENT_GOAWAY || + NS_ERROR_GET_MODULE(aStatus) == NS_ERROR_MODULE_TOR || NS_ERROR_GET_MODULE(aStatus) == NS_ERROR_MODULE_SECURITY) { // Errors to be shown for any frame DisplayLoadError(aStatus, url, nullptr, aChannel); @@ -8371,6 +8406,33 @@ nsresult nsDocShell::CreateContentViewer(const nsACString& aContentType, FireOnLocationChange(this, aRequest, mCurrentURI, locationFlags); } + // Arrange to show a Tor onion service client authentication prompt if + // appropriate. + if ((mLoadType == LOAD_ERROR_PAGE) && failedChannel) { + nsresult status = NS_OK; + if (NS_SUCCEEDED(failedChannel->GetStatus(&status)) && + ((status == NS_ERROR_TOR_ONION_SVC_MISSING_CLIENT_AUTH) || + (status == NS_ERROR_TOR_ONION_SVC_BAD_CLIENT_AUTH))) { + nsAutoCString onionHost; + failedURI->GetHost(onionHost); + if (XRE_IsContentProcess()) { + nsCOMPtr<nsIBrowserChild> browserChild = GetBrowserChild(); + if (browserChild) { + static_cast<BrowserChild*>(browserChild.get()) + ->SendShowOnionServicesAuthPrompt(onionHost); + } + } else { + nsCOMPtr<nsPIDOMWindowOuter> browserWin = GetWindow(); + nsCOMPtr<nsIObserverService> obsSvc = services::GetObserverService(); + if (browserWin && obsSvc) { + const char* topic = "tor-onion-services-auth-prompt"; + obsSvc->NotifyObservers(browserWin, topic, + NS_ConvertUTF8toUTF16(onionHost).get()); + } + } + } + } + return NS_OK; } diff --git a/dom/ipc/BrowserParent.cpp b/dom/ipc/BrowserParent.cpp index 42e5cbd10cc1..88605c949502 100644 --- a/dom/ipc/BrowserParent.cpp +++ b/dom/ipc/BrowserParent.cpp @@ -3776,6 +3776,29 @@ mozilla::ipc::IPCResult BrowserParent::RecvShowCanvasPermissionPrompt( return IPC_OK(); } +mozilla::ipc::IPCResult BrowserParent::RecvShowOnionServicesAuthPrompt( + const nsCString& aOnionName) { + nsCOMPtr<nsIBrowser> browser = + mFrameElement ? mFrameElement->AsBrowser() : nullptr; + if (!browser) { + // If the tab is being closed, the browser may not be available. + // In this case we can ignore the request. + return IPC_OK(); + } + nsCOMPtr<nsIObserverService> os = services::GetObserverService(); + if (!os) { + return IPC_FAIL_NO_REASON(this); + } + nsresult rv = os->NotifyObservers( + browser, + "tor-onion-services-auth-prompt", + NS_ConvertUTF8toUTF16(aOnionName).get()); + if (NS_FAILED(rv)) { + return IPC_FAIL_NO_REASON(this); + } + return IPC_OK(); +} + mozilla::ipc::IPCResult BrowserParent::RecvVisitURI( const URIParams& aURI, const Maybe<URIParams>& aLastVisitedURI, const uint32_t& aFlags) { diff --git a/dom/ipc/BrowserParent.h b/dom/ipc/BrowserParent.h index 1be1da2e4d81..23c189cf6243 100644 --- a/dom/ipc/BrowserParent.h +++ b/dom/ipc/BrowserParent.h @@ -718,6 +718,9 @@ class BrowserParent final : public PBrowserParent, mozilla::ipc::IPCResult RecvShowCanvasPermissionPrompt( const nsCString& aOrigin, const bool& aHideDoorHanger); + mozilla::ipc::IPCResult RecvShowOnionServicesAuthPrompt( + const nsCString& aOnionName); + mozilla::ipc::IPCResult RecvSetSystemFont(const nsCString& aFontName); mozilla::ipc::IPCResult RecvGetSystemFont(nsCString* aFontName); diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl index 55ce57441a2d..b99d7f04fe39 100644 --- a/dom/ipc/PBrowser.ipdl +++ b/dom/ipc/PBrowser.ipdl @@ -562,6 +562,14 @@ parent: int32_t[] aPositionDescendants, uint32_t aFlushId); + /** + * This function is used to notify the parent that it should display a + * onion services client authentication prompt. + * + * @param aOnionHost The hostname of the .onion that needs authentication. + */ + async ShowOnionServicesAuthPrompt(nsCString aOnionHost); + child: async NativeSynthesisResponse(uint64_t aObserverId, nsCString aResponse); async FlushTabState(uint32_t aFlushId); diff --git a/js/xpconnect/src/xpc.msg b/js/xpconnect/src/xpc.msg index d0088cb2fb07..d9b64fe87fce 100644 --- a/js/xpconnect/src/xpc.msg +++ b/js/xpconnect/src/xpc.msg @@ -246,5 +246,13 @@ XPC_MSG_DEF(NS_ERROR_HARMFUL_URI , "The URI is harmful") XPC_MSG_DEF(NS_ERROR_FINGERPRINTING_URI , "The URI is fingerprinting") XPC_MSG_DEF(NS_ERROR_CRYPTOMINING_URI , "The URI is cryptomining") +/* Codes related to Tor */ +XPC_MSG_DEF(NS_ERROR_TOR_ONION_SVC_NOT_FOUND , "Tor onion service descriptor cannot be found") +XPC_MSG_DEF(NS_ERROR_TOR_ONION_SVC_IS_INVALID , "Tor onion service descriptor is invalid") +XPC_MSG_DEF(NS_ERROR_TOR_ONION_SVC_INTRO_FAILED , "Tor onion service introduction failed") +XPC_MSG_DEF(NS_ERROR_TOR_ONION_SVC_REND_FAILED , "Tor onion service rendezvous failed") +XPC_MSG_DEF(NS_ERROR_TOR_ONION_SVC_MISSING_CLIENT_AUTH, "Tor onion service missing client authorization") +XPC_MSG_DEF(NS_ERROR_TOR_ONION_SVC_BAD_CLIENT_AUTH , "Tor onion service wrong client authorization") + /* Profile manager error codes */ XPC_MSG_DEF(NS_ERROR_DATABASE_CHANGED , "Flushing the profiles to disk would have overwritten changes made elsewhere.") diff --git a/netwerk/base/nsSocketTransport2.cpp b/netwerk/base/nsSocketTransport2.cpp index 04f692dcd7e0..e6a32bddb16f 100644 --- a/netwerk/base/nsSocketTransport2.cpp +++ b/netwerk/base/nsSocketTransport2.cpp @@ -213,6 +213,12 @@ nsresult ErrorAccordingToNSPR(PRErrorCode errorCode) { default: if (psm::IsNSSErrorCode(errorCode)) { rv = psm::GetXPCOMFromNSSError(errorCode); + } else { + // If we received a Tor extended error code via SOCKS, pass it through. + nsresult res = nsresult(errorCode); + if (NS_ERROR_GET_MODULE(res) == NS_ERROR_MODULE_TOR) { + rv = res; + } } break; diff --git a/netwerk/socket/nsSOCKSIOLayer.cpp b/netwerk/socket/nsSOCKSIOLayer.cpp index 6909ade1c958..6649056da1e7 100644 --- a/netwerk/socket/nsSOCKSIOLayer.cpp +++ b/netwerk/socket/nsSOCKSIOLayer.cpp @@ -1012,6 +1012,36 @@ PRStatus nsSOCKSSocketInfo::ReadV5ConnectResponseTop() { "08, Address type not supported.")); c = PR_BAD_ADDRESS_ERROR; break; + case 0xF0: // Tor SOCKS5_HS_NOT_FOUND + LOGERROR(("socks5: connect failed: F0," + " Tor onion service descriptor can not be found.")); + c = static_cast<uint32_t>(NS_ERROR_TOR_ONION_SVC_NOT_FOUND); + break; + case 0xF1: // Tor SOCKS5_HS_IS_INVALID + LOGERROR(("socks5: connect failed: F1," + " Tor onion service descriptor is invalid.")); + c = static_cast<uint32_t>(NS_ERROR_TOR_ONION_SVC_IS_INVALID); + break; + case 0xF2: // Tor SOCKS5_HS_INTRO_FAILED + LOGERROR(("socks5: connect failed: F2," + " Tor onion service introduction failed.")); + c = static_cast<uint32_t>(NS_ERROR_TOR_ONION_SVC_INTRO_FAILED); + break; + case 0xF3: // Tor SOCKS5_HS_REND_FAILED + LOGERROR(("socks5: connect failed: F3," + " Tor onion service rendezvous failed.")); + c = static_cast<uint32_t>(NS_ERROR_TOR_ONION_SVC_REND_FAILED); + break; + case 0xF4: // Tor SOCKS5_HS_MISSING_CLIENT_AUTH + LOGERROR(("socks5: connect failed: F4," + " Tor onion service missing client authorization.")); + c = static_cast<uint32_t>(NS_ERROR_TOR_ONION_SVC_MISSING_CLIENT_AUTH); + break; + case 0xF5: // Tor SOCKS5_HS_BAD_CLIENT_AUTH + LOGERROR(("socks5: connect failed: F5," + " Tor onion service wrong client authorization.")); + c = static_cast<uint32_t>(NS_ERROR_TOR_ONION_SVC_BAD_CLIENT_AUTH); + break; default: LOGERROR(("socks5: connect failed.")); break; diff --git a/toolkit/modules/PopupNotifications.jsm b/toolkit/modules/PopupNotifications.jsm index a6f8be0be40c..fe8e6d4949a4 100644 --- a/toolkit/modules/PopupNotifications.jsm +++ b/toolkit/modules/PopupNotifications.jsm @@ -400,6 +400,8 @@ PopupNotifications.prototype = { * - "menucommand" if a menu was activated. * - [optional] dismiss (boolean): If this is true, the notification * will be dismissed instead of removed after running the callback. + * - [optional] leaveOpen (boolean): If this is true, the notification + * will not be removed after running the callback. * - [optional] disableHighlight (boolean): If this is true, the button * will not apply the default highlight style. * If null, the notification will have a default "OK" action button @@ -1863,6 +1865,10 @@ PopupNotifications.prototype = { this._dismiss(); return; } + + if (action.leaveOpen) { + return; + } } this._remove(notification); diff --git a/xpcom/base/ErrorList.py b/xpcom/base/ErrorList.py index 48b3149a4255..24cabd355b0d 100755 --- a/xpcom/base/ErrorList.py +++ b/xpcom/base/ErrorList.py @@ -84,6 +84,7 @@ modules["URL_CLASSIFIER"] = Mod(42) # ErrorResult gets its own module to reduce the chance of someone accidentally # defining an error code matching one of the ErrorResult ones. modules["ERRORRESULT"] = Mod(43) +modules["TOR"] = Mod(44) # NS_ERROR_MODULE_GENERAL should be used by modules that do not # care if return code values overlap. Callers of methods that @@ -1120,6 +1121,23 @@ with modules["ERRORRESULT"]: # ======================================================================= +# 44: Tor-specific error codes. +# ======================================================================= +with modules["TOR"]: + # Tor onion service descriptor can not be found. + errors["NS_ERROR_TOR_ONION_SVC_NOT_FOUND"] = FAILURE(1) + # Tor onion service descriptor is invalid. + errors["NS_ERROR_TOR_ONION_SVC_IS_INVALID"] = FAILURE(2) + # Tor onion service introduction failed. + errors["NS_ERROR_TOR_ONION_SVC_INTRO_FAILED"] = FAILURE(3) + # Tor onion service rendezvous failed. + errors["NS_ERROR_TOR_ONION_SVC_REND_FAILED"] = FAILURE(4) + # Tor onion service missing client authorization. + errors["NS_ERROR_TOR_ONION_SVC_MISSING_CLIENT_AUTH"] = FAILURE(5) + # Tor onion service wrong client authorization. + errors["NS_ERROR_TOR_ONION_SVC_BAD_CLIENT_AUTH"] = FAILURE(6) + +# ======================================================================= # 51: NS_ERROR_MODULE_GENERAL # ======================================================================= with modules["GENERAL"]:

1 0

[tor-browser/tor-browser-68.4.1esr-9.5-1] Merge commit '6cac185d0c10e4f26ca7eaf000c31fae36d13bfc' into tor-browser-68.4.1esr-9.5-1
by sysrqb＠torproject.org 05 Feb '20

05 Feb '20

commit 28641dbae674f58429aa3518342555a6b977342e Merge: 45677fd3bc4f 6cac185d0c10 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Feb 5 00:02:35 2020 +0000 Merge commit '6cac185d0c10e4f26ca7eaf000c31fae36d13bfc' into tor-browser-68.4.1esr-9.5-1 browser/actors/NetErrorChild.jsm | 2 +- browser/base/content/browser.js | 10 + browser/base/content/browser.xul | 3 + browser/base/content/tab-content.js | 5 + browser/components/moz.build | 1 + .../content/authNotificationIcon.inc.xul | 6 + .../onionservices/content/authPopup.inc.xul | 14 + .../components/onionservices/content/authPrompt.js | 290 +++++++++++++++++++++ .../components/onionservices/content/authUtil.jsm | 32 +++ .../onionservices/content/onionservices.css | 69 +++++ browser/components/onionservices/jar.mn | 4 + browser/components/onionservices/moz.build | 1 + browser/modules/TorStrings.jsm | 74 +++++- browser/themes/shared/notification-icons.inc.css | 3 + docshell/base/nsDocShell.cpp | 62 +++++ dom/ipc/BrowserParent.cpp | 23 ++ dom/ipc/BrowserParent.h | 3 + dom/ipc/PBrowser.ipdl | 8 + js/xpconnect/src/xpc.msg | 8 + netwerk/base/nsSocketTransport2.cpp | 6 + netwerk/socket/nsSOCKSIOLayer.cpp | 30 +++ toolkit/modules/PopupNotifications.jsm | 6 + xpcom/base/ErrorList.py | 18 ++ 23 files changed, 672 insertions(+), 6 deletions(-)

1 0

[torbutton/master] Bug 30237: Control port module improvements for v3 client authentication
by sysrqb＠torproject.org 04 Feb '20

04 Feb '20

commit 9dbc7d20a0efbe6d6d085950c937ed223176e6fa Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Dec 4 09:41:18 2019 -0500 Bug 30237: Control port module improvements for v3 client authentication Modify the Tor controller onionAuthAdd() function to remove support for the nickname parameter (not supported by tor) and add some missing parameter validation. --- modules/tor-control-port.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/modules/tor-control-port.js b/modules/tor-control-port.js index 1b0a79ad..815df473 100644 --- a/modules/tor-control-port.js +++ b/modules/tor-control-port.js @@ -580,15 +580,21 @@ info.getConf = function (aControlSocket, key) { // A namespace for functions related to tor's ONION_CLIENT_AUTH_* commands. let onionAuth = {}; -// __onionAuth.add(controlSocket, hsAddress, b64PrivateKey, nickname, isPermanent)__. +// __onionAuth.add(controlSocket, hsAddress, b64PrivateKey, isPermanent)__. // Sends a ONION_CLIENT_AUTH_ADD command to add a private key to the // Tor configuration. onionAuth.add = function (aControlSocket, hsAddress, b64PrivateKey, - nickname, isPermanent) { + isPermanent) { + if (!utils.isString(hsAddress)) { + return utils.rejectPromise("hsAddress argument should be a string"); + } + + if (!utils.isString(b64PrivateKey)) { + return utils.rejectPromise("b64PrivateKey argument should be a string"); + } + const keyType = "x25519"; let cmd = `onion_client_auth_add ${hsAddress} ${keyType}:${b64PrivateKey}`; - if (nickname) - cmd += ` ClientName=${nickname}`; if (isPermanent) cmd += " Flags=Permanent"; return aControlSocket.sendCommand(cmd); @@ -649,9 +655,9 @@ tor.controller = function (ipcFile, host, port, password, onError) { isOpen = true; return { getInfo : key => info.getInfo(socket, key), getConf : key => info.getConf(socket, key), - onionAuthAdd : (hsAddress, b64PrivateKey, nickname, isPermanent) => + onionAuthAdd : (hsAddress, b64PrivateKey, isPermanent) => onionAuth.add(socket, hsAddress, b64PrivateKey, - nickname, isPermanent), + isPermanent), watchEvent : (type, filter, onData) => event.watchEvent(socket, type, filter, onData), isOpen : () => isOpen,

1 0

[tor-browser-build/master] Merge remote-tracking branch 'cohosh/ticket/32870'
by boklm＠torproject.org 03 Feb '20

03 Feb '20

commit af8affa4bfb0c1cea943de716ce64da7c5d2d146 Merge: 930497f 21fe6c3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Feb 3 15:32:00 2020 +0100 Merge remote-tracking branch 'cohosh/ticket/32870' projects/gocheck/config | 6 +++++- projects/pion-datachannel/config | 5 +---- projects/pion-dtls/config | 2 +- projects/pion-ice/config | 2 +- projects/pion-mdns/config | 5 ++++- projects/pion-rtp/config | 2 +- projects/pion-sctp/config | 11 ++++++++++- projects/pion-sdp/config | 2 +- projects/pion-stun/config | 2 +- projects/pion-transport/config | 3 ++- projects/pion-turn/config | 8 +++++++- projects/pion-webrtc/config | 5 ++++- projects/pretty/config | 21 +++++++++++++++++++++ projects/pty/config | 17 +++++++++++++++++ projects/text/config | 21 +++++++++++++++++++++ 15 files changed, 97 insertions(+), 15 deletions(-)

1 0

[tor-browser-build/master] Bug 32870: Update version of pion-webrtc
by boklm＠torproject.org 03 Feb '20

03 Feb '20

commit 21fe6c309dc17fc8b989ad31a6a308b86b130bf3 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Jan 2 21:09:57 2020 +0000 Bug 32870: Update version of pion-webrtc This updates the version of the pion webrtc library used by snowflake to v2.1.18. --- projects/gocheck/config | 6 +++++- projects/pion-datachannel/config | 5 +---- projects/pion-dtls/config | 2 +- projects/pion-ice/config | 2 +- projects/pion-mdns/config | 5 ++++- projects/pion-rtp/config | 2 +- projects/pion-sctp/config | 11 ++++++++++- projects/pion-sdp/config | 2 +- projects/pion-stun/config | 2 +- projects/pion-transport/config | 3 ++- projects/pion-turn/config | 8 +++++++- projects/pion-webrtc/config | 5 ++++- projects/pretty/config | 21 +++++++++++++++++++++ projects/pty/config | 17 +++++++++++++++++ projects/text/config | 21 +++++++++++++++++++++ 15 files changed, 97 insertions(+), 15 deletions(-) diff --git a/projects/gocheck/config b/projects/gocheck/config index a78af0f..bc71d01 100644 --- a/projects/gocheck/config +++ b/projects/gocheck/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://gopkg.in/check.v1 -git_hash: 20d25e2804050c1cd24a7eea1e7a6447dd0e74ec +git_hash: 41f04d3bba152ddec2103e299fed053415705330 # v1.0.0 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -10,8 +10,12 @@ var: container: use_container: 1 go_lib: gopkg.in/check.v1 + go_lib_deps: + - pretty input_files: - project: container-image - name: go project: go + - name: pretty + project: pretty diff --git a/projects/pion-datachannel/config b/projects/pion-datachannel/config index 50094d6..b8a521c 100644 --- a/projects/pion-datachannel/config +++ b/projects/pion-datachannel/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/datachannel -git_hash: 401bef0a9b89c2ca212c908999709ff1967c9617 # v1.4.5 +git_hash: 58b4a51d48764c2cb19e0c7ced43640a87857c69 # v1.4.13 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -11,7 +11,6 @@ var: use_container: 1 go_lib: github.com/pion/datachannel go_lib_deps: - - go-spew - goerrors - pion-logging - pion-sctp @@ -22,8 +21,6 @@ input_files: - project: container-image - name: go project: go - - name: go-spew - project: go-spew - name: goerrors project: goerrors - name: pion-logging diff --git a/projects/pion-dtls/config b/projects/pion-dtls/config index af2a17f..244c764 100644 --- a/projects/pion-dtls/config +++ b/projects/pion-dtls/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/dtls -git_hash: 91d652d3f91d6c08c193e4d297067f8f653775f9 # v1.5.1 +git_hash: 8748e4ac8bf7960bbf399e6f23a9bf4dd30d4e92 # v2.0.0-rc.3 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-ice/config b/projects/pion-ice/config index 8946852..56d0a03 100644 --- a/projects/pion-ice/config +++ b/projects/pion-ice/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/ice -git_hash: 45cb33ebe6b557dbf50a7779cd713aeedbc84813 # v0.5.13 +git_hash: 57e7b93a4bac70ee2fd3b38cc2fdf3c6d586ed27 # v0.7.6 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-mdns/config b/projects/pion-mdns/config index 05eb8c4..510b97c 100644 --- a/projects/pion-mdns/config +++ b/projects/pion-mdns/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/mdns -git_hash: c5bfa7641a9decf65f7597ba5299c3ee36feb28e # v0.0.3 +git_hash: 0200ff62c805e3b691a6b8764f2de93909b90bb3 # v0.0.4 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -13,6 +13,7 @@ var: go_lib_deps: - goxnet - pion-logging + - pion-transport input_files: - project: container-image @@ -22,3 +23,5 @@ input_files: project: goxnet - name: pion-logging project: pion-logging + - name: pion-transport + project: pion-transport diff --git a/projects/pion-rtp/config b/projects/pion-rtp/config index 0f586ec..5e63b29 100644 --- a/projects/pion-rtp/config +++ b/projects/pion-rtp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/rtp -git_hash: 23312f4b270b6a469355099f9cfb96d871240098 # v1.1.3 +git_hash: 94055aff4ae00d46f218eab6949fa713d48306af # v1.1.4 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-sctp/config b/projects/pion-sctp/config index 8615bd4..a81911c 100644 --- a/projects/pion-sctp/config +++ b/projects/pion-sctp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/sctp -git_hash: 321ee3612199dd7363fc63ec4e111db50c22faf1 # v1.6.9 +git_hash: ced24b2276cf7991920a301ce5f0735cabafaf3e # v1.7.3 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -11,20 +11,29 @@ var: use_container: 1 go_lib: github.com/pion/sctp go_lib_deps: + - go-spew + - gocheck - goerrors - pion-logging - pion-transport + - pretty - testify input_files: - project: container-image - name: go project: go + - name: go-spew + project: go-spew + - name: gocheck + project: gocheck - name: goerrors project: goerrors - name: pion-logging project: pion-logging - name: pion-transport project: pion-transport + - name: pretty + project: pretty - name: testify project: testify diff --git a/projects/pion-sdp/config b/projects/pion-sdp/config index 7f95bc0..1a865d4 100644 --- a/projects/pion-sdp/config +++ b/projects/pion-sdp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/sdp -git_hash: 03441e3c706c7c3b719ee75194049a31cbb2eb7e # v2.3.0 +git_hash: 9b824fbb8047370a0073ef4b9ebae356e7536502 # v2.3.1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-stun/config b/projects/pion-stun/config index aeba0af..37405eb 100644 --- a/projects/pion-stun/config +++ b/projects/pion-stun/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/stun -git_hash: 8136435b6d3ad36535081253a032468235a43581 # v0.3.1 +git_hash: 51fef3542ed793994ff3da9c9b897fb23d744503 # v0.3.3 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-transport/config b/projects/pion-transport/config index be3d385..b2615be 100644 --- a/projects/pion-transport/config +++ b/projects/pion-transport/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/transport -git_hash: 6903e3cd05a899ca7284753a4b6cb265655c28ff # v0.8.6 +git_hash: 95bf2d4e3f04b8d658048d1de02b30a27c8acc18 # v0.8.10 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -18,6 +18,7 @@ var: - github.com/pion/transport/test - github.com/pion/transport/vnet + input_files: - project: container-image - name: go diff --git a/projects/pion-turn/config b/projects/pion-turn/config index 06a6f14..2cbef46 100644 --- a/projects/pion-turn/config +++ b/projects/pion-turn/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/turn -git_hash: cab8f88798429b68b7cfb4db7c12fc6d205e91e2 # v1.3.5 +git_hash: bac88c5c692a9826c9703b2950dc52093ae1779a # v1.4.0 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -12,10 +12,12 @@ var: go_lib: github.com/pion/turn go_lib_deps: - go-spew + - gocheck - goerrors - pion-logging - pion-stun - pion-transport + - pretty - testify input_files: @@ -24,6 +26,8 @@ input_files: project: go - name: go-spew project: go-spew + - name: gocheck + project: gocheck - name: goerrors project: goerrors - name: pion-logging @@ -32,5 +36,7 @@ input_files: project: pion-stun - name: pion-transport project: pion-transport + - name: pretty + project: pretty - name: testify project: testify diff --git a/projects/pion-webrtc/config b/projects/pion-webrtc/config index 0f22dbb..925bb1c 100644 --- a/projects/pion-webrtc/config +++ b/projects/pion-webrtc/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/webrtc -git_hash: 5bceb0126f92c42015a1e143e24ae84122b8f0b0 # v2.1.3 +git_hash: 77c6e3b827e40175572fcf2894bb81ab1e8fd2c9 # v2.1.18 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -11,6 +11,7 @@ var: use_container: 1 go_lib: github.com/pion/webrtc go_lib_deps: + - goxcrypto - pion-datachannel - pion-dtls - pion-ice @@ -28,6 +29,8 @@ input_files: - project: container-image - name: go project: go + - name: goxcrypto + project: goxcrypto - name: pion-datachannel project: pion-datachannel - name: pion-dtls diff --git a/projects/pretty/config b/projects/pretty/config new file mode 100644 index 0000000..7514e53 --- /dev/null +++ b/projects/pretty/config @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/kr/pretty +git_hash: 73f6ac0b30a98e433b289500d779f50c1a6f0712 # v0.1.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/kr/pretty + go_lib_deps: + - text + +input_files: + - project: container-image + - name: go + project: go + - name: text + project: text diff --git a/projects/pty/config b/projects/pty/config new file mode 100644 index 0000000..ab2d7bd --- /dev/null +++ b/projects/pty/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/kr/pty +git_hash: 282ce0e5322c82529687d609ee670fac7c7d917c # v1.1.1 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/kr/pty + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/text/config b/projects/text/config new file mode 100644 index 0000000..aeb449b --- /dev/null +++ b/projects/text/config @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/kr/text +git_hash: e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f # v0.1.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/kr/text + go_lib_deps: + - pty + +input_files: + - project: container-image + - name: go + project: go + - name: pty + project: pty

1 0

[tor-browser-build/master] Bug 31988: Add script to generate a mar signing key for nightly builds
by boklm＠torproject.org 30 Jan '20

30 Jan '20

commit 930497f483bc85e056ed278e00edd3266c4fed47 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 16 19:02:01 2019 +0100 Bug 31988: Add script to generate a mar signing key for nightly builds --- tools/signing/nightly/.gitignore | 1 + tools/signing/nightly/create-nightly-mar-signing-key | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/tools/signing/nightly/.gitignore b/tools/signing/nightly/.gitignore new file mode 100644 index 0000000..ec07f9a --- /dev/null +++ b/tools/signing/nightly/.gitignore @@ -0,0 +1 @@ +nssdb diff --git a/tools/signing/nightly/create-nightly-mar-signing-key b/tools/signing/nightly/create-nightly-mar-signing-key new file mode 100755 index 0000000..e4138be --- /dev/null +++ b/tools/signing/nightly/create-nightly-mar-signing-key @@ -0,0 +1,13 @@ +#!/bin/bash +set -e +nssdb="$(dirname "$0")/nssdb" +if test -d $nssdb +then + echo "Error: $nssdb already exists" >&2 + exit 1 +fi +mkdir -p $nssdb +chmod 700 $nssdb +certutil -d $nssdb -N --empty-password +certutil -d $nssdb -S -x -g 4096 -Z SHA384 -n nightly-marsigner -s "CN=Tor Browser Nightly MAR signing key" -t,, +certutil -d $nssdb -L -r -n nightly-marsigner -o $nssdb/nightly-marsigner.der

1 0

[tor-browser-build/master] Bug 32700: Don't disable GeckoDriver separately
by boklm＠torproject.org 30 Jan '20

30 Jan '20

commit 40502c9d0abb4e2c6b732162536fd2ea26bfe35b Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 9 07:46:12 2019 +0000 Bug 32700: Don't disable GeckoDriver separately --- projects/firefox/mozconfig-windows-i686 | 1 - projects/firefox/mozconfig-windows-x86_64 | 1 - 2 files changed, 2 deletions(-) diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index fe3cc7d..4fd9958 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -38,7 +38,6 @@ ac_add_options --disable-maintenance-service ac_add_options --enable-proxy-bypass-protection ac_add_options --disable-webrtc # Bug 1393901 ac_add_options --disable-tests -ac_add_options --disable-geckodriver # Bug 1489320 # Disable telemetry ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index ef28c9b..ae5cf67 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -38,7 +38,6 @@ ac_add_options --disable-maintenance-service ac_add_options --enable-proxy-bypass-protection ac_add_options --disable-webrtc # Bug 1393901 ac_add_options --disable-tests -ac_add_options --disable-geckodriver # Bug 1489320 # Disable telemetry ac_add_options MOZ_TELEMETRY_REPORTING=

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_32700'
by boklm＠torproject.org 30 Jan '20

30 Jan '20

commit b1690c3404c0454cb805a01e94e7d45e74ad17e0 Merge: 4e682a9 40502c9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jan 30 14:14:09 2020 +0100 Merge remote-tracking branch 'gk/bug_32700' projects/firefox/mozconfig-windows-i686 | 1 - projects/firefox/mozconfig-windows-x86_64 | 1 - 2 files changed, 2 deletions(-)

1 0

[tor-browser-build/master] Bug 27903: Isolate Tor Browser from dconf-service
by boklm＠torproject.org 30 Jan '20

30 Jan '20

commit 4e682a909ec2af4c0452934446392f7ff918d8d1 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Jan 30 13:52:50 2020 +0100 Bug 27903: Isolate Tor Browser from dconf-service --- projects/tor-browser/RelativeLink/start-tor-browser | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser index 9356d4c..624bb3c 100755 --- a/projects/tor-browser/RelativeLink/start-tor-browser +++ b/projects/tor-browser/RelativeLink/start-tor-browser @@ -346,6 +346,9 @@ setControlPortPasswd ${TOR_CONTROL_PASSWD:='"secret"'} export FONTCONFIG_PATH="${HOME}/TorBrowser/Data/fontconfig" export FONTCONFIG_FILE="fonts.conf" +# Avoid overwriting user's dconf values. Fixes #27903. +export GSETTINGS_BACKEND=memory + cd "${HOME}" # We pass all additional command-line arguments we get to Firefox.

1 0

[tor-browser-build/maint-9.0] Bug 32891: Add new IPv4/IPv6 default bridge.
by boklm＠torproject.org 30 Jan '20

30 Jan '20

commit 82672d50af26c862214f3c1c2670897f94a9dbf9 Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Jan 8 15:46:19 2020 +0100 Bug 32891: Add new IPv4/IPv6 default bridge. Toke Høiland-Jørgensen generously offered to set up a default bridge in Denmark. This fixes <https://bugs.torproject.org/32891>. --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index da3f2cd..a87aa58 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -16,6 +16,8 @@ pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 193.11.166.194:270 pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/master] Merge remote-tracking branch 'phw/task/32891'
by boklm＠torproject.org 30 Jan '20

30 Jan '20

commit 215aed39ee177bd0a371e8e4b6d7de3fcf69ffed Merge: e1127b3 21faabf Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jan 30 13:31:34 2020 +0100 Merge remote-tracking branch 'phw/task/32891' projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor-browser-build/master] Bug 32891: Add new IPv4/IPv6 default bridge.
by boklm＠torproject.org 30 Jan '20

30 Jan '20

commit 21faabfdbf08dbf25ff1fcf77c54d684b15c6fa1 Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Jan 8 15:46:19 2020 +0100 Bug 32891: Add new IPv4/IPv6 default bridge. Toke Høiland-Jørgensen generously offered to set up a default bridge in Denmark. This fixes <https://bugs.torproject.org/32891>. --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index da3f2cd..a87aa58 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -16,6 +16,8 @@ pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 193.11.166.194:270 pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser/tor-browser-68.4.1esr-9.5-1] Bug 1590538 - Don't pass an empty object to urlbar-user-start-navigation because it doesn't handle it properly. r=Standard8
by boklm＠torproject.org 30 Jan '20

30 Jan '20

commit d361b0b2c8e51cec5088233006be152c340b6553 Author: Marco Bonardo <mbonardo(a)mozilla.com> Date: Wed Oct 30 14:25:02 2019 +0000 Bug 1590538 - Don't pass an empty object to urlbar-user-start-navigation because it doesn't handle it properly. r=Standard8 Differential Revision: https://phabricator.services.mozilla.com/D50634 --HG-- extra : moz-landing-system : lando --- browser/components/urlbar/UrlbarInput.jsm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm index cb0ab15d7ebf..21a7a5d9910f 100644 --- a/browser/components/urlbar/UrlbarInput.jsm +++ b/browser/components/urlbar/UrlbarInput.jsm @@ -1217,9 +1217,9 @@ class UrlbarInput { * @param {nsIInputStream} [params.postData] * The POST data associated with a search submission. * @param {boolean} [params.allowInheritPrincipal] - * If the principal may be inherited - * @param {object} [result] - * Details of the selected result, if any + * Whether the principal can be inherited. + * @param {object} [resultDetails] + * Details of the selected result, if any. * @param {UrlbarUtils.RESULT_TYPE} [result.type] * Details of the result type, if any. * @param {UrlbarUtils.RESULT_SOURCE} [result.source] @@ -1230,7 +1230,7 @@ class UrlbarInput { url, openUILinkWhere, params, - result = {}, + resultDetails = null, browser = this.window.gBrowser.selectedBrowser ) { // No point in setting these because we'll handleRevert() a few rows below. @@ -1286,7 +1286,7 @@ class UrlbarInput { } // Notify about the start of navigation. - this._notifyStartNavigation(result); + this._notifyStartNavigation(resultDetails); try { this.window.openTrustedLinkIn(url, openUILinkWhere, params); @@ -1407,7 +1407,7 @@ class UrlbarInput { * if they aren't being used, e.g. WebNavigation. * * @param {UrlbarResult} result - * The result that was selected, if any. + * Details of the result that was selected, if any. */ _notifyStartNavigation(result) { Services.obs.notifyObservers({ result }, "urlbar-user-start-navigation");

1 0

[tor-browser/tor-browser-68.4.1esr-9.5-1] Revert "Bug 31764: Fix for error when navigating via 'Paste and go'"
by boklm＠torproject.org 30 Jan '20

30 Jan '20

commit 45677fd3bc4fd9b69216bb25efadcbac3026672f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jan 30 11:57:52 2020 +0100 Revert "Bug 31764: Fix for error when navigating via 'Paste and go'" This reverts commit 59d89229b68f8fbaa46e910a9bd03a6b26e8403e. With #32470 we backported Mozilla's fix for this issue. --- browser/components/urlbar/UrlbarInput.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm index 21a7a5d9910f..131d2ecc8ca8 100644 --- a/browser/components/urlbar/UrlbarInput.jsm +++ b/browser/components/urlbar/UrlbarInput.jsm @@ -443,7 +443,7 @@ class UrlbarInput { return; } - this._loadURL(url, where, openParams, null); + this._loadURL(url, where, openParams); } handleRevert() {

1 0

[tor-browser/tor-browser-68.4.1esr-9.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by boklm＠torproject.org 28 Jan '20

28 Jan '20

commit e8411693ccfa757557eecd97baaa8bb12a5c87dc Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jan 15 13:16:44 2020 +0100 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 32948: Make referer behavior consistent regardless of private browing mode status --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 1e054bf4a0c9..0176e8feb64d 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -137,6 +137,7 @@ pref("privacy.resistFingerprinting.letterboxing", true); // https://trac.torproject.org/projects/tor/ticket/27268#comment:19. We should // not leak that difference if possible. pref("dom.netinfo.enabled", false); +pref("network.http.referer.defaultPolicy", 2); // Bug 32948: Make referer behavior consistent regardless of private browing mode status // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation

1 0

[tor-browser/tor-browser-68.4.1esr-9.5-1] fixup! Regression tests for TB4: Tor Browser's Firefox preference overrides.
by boklm＠torproject.org 28 Jan '20

28 Jan '20

commit 77970cdee3ba6c294a7acfe9d9b5a2ae9511e579 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 8 15:30:20 2020 +0000 fixup! Regression tests for TB4: Tor Browser's Firefox preference overrides. --- tbb-tests/browser_tor_TB4.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tbb-tests/browser_tor_TB4.js b/tbb-tests/browser_tor_TB4.js index c1f748a3338f..032386e22ae1 100644 --- a/tbb-tests/browser_tor_TB4.js +++ b/tbb-tests/browser_tor_TB4.js @@ -64,18 +64,7 @@ let expectedPrefs = [ ["browser.display.max_font_attempts",10], ["browser.display.max_font_count",10], ["gfx.downloadable_fonts.fallback_delay", -1], - ["general.appname.override", "Netscape"], - ["general.appversion.override", "5.0 (Windows)"], - ["general.oscpu.override", "Windows NT 6.1"], - ["general.platform.override", "Win32"], - ["general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Firefox/24.0"], - ["general.productSub.override", "20100101"], - ["general.buildID.override", "20100101"], ["browser.startup.homepage_override.buildID", "20100101"], - ["general.useragent.vendor", ""], - ["general.useragent.vendorSub", ""], - ["dom.enable_performance", false], - ["browser.zoom.siteSpecific", false], // Third party stuff ["network.cookie.cookieBehavior", 1],

1 0

[tor-browser/tor-browser-68.4.1esr-9.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by boklm＠torproject.org 28 Jan '20

28 Jan '20

commit da7e8b35800a41249b5c2a847c4f931c4bf6582a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 9 10:13:29 2020 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Remaining clean-up done in #27268. --- browser/app/profile/000-tor-browser.js | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index fb99eb6ed7d1..1e054bf4a0c9 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -114,34 +114,14 @@ pref("webgl.disable-extensions", true); pref("webgl.disable-fail-if-major-performance-caveat", true); pref("webgl.enable-webgl2", false); pref("gfx.downloadable_fonts.fallback_delay", -1); -pref("general.appname.override", "Netscape"); -pref("general.appversion.override", "5.0 (Windows)"); -pref("general.oscpu.override", "Windows NT 6.1"); -pref("general.platform.override", "Win32"); -pref("general.productSub.override", "20100101"); -pref("general.buildID.override", "20100101"); pref("browser.startup.homepage_override.buildID", "20100101"); -pref("general.useragent.vendor", ""); -pref("general.useragent.vendorSub", ""); -pref("dom.enable_performance", false); -pref("browser.zoom.siteSpecific", false); pref("browser.link.open_newwindow.restriction", 0); // Bug 9881: Open popups in new tabs (to avoid fullscreen popups) -pref("dom.gamepad.enabled", false); // bugs.torproject.org/13023 -// Disable video statistics fingerprinting vector (bug 15757) -pref("media.video_stats.enabled", false); // Set video VP9 to 0 for everyone (bug 22548) pref("media.benchmark.vp9.threshold", 0); -// Disable device sensors as possible fingerprinting vector (bug 15758) -pref("device.sensors.enabled", false); pref("dom.enable_resource_timing", false); // Bug 13024: To hell with this API pref("privacy.resistFingerprinting", true); pref("privacy.resistFingerprinting.block_mozAddonManager", true); // Bug 26114 -pref("privacy.suppressModifierKeyEvents", true); // Bug #17009: Suppress ALT and SHIFT events" -pref("ui.use_standins_for_native_colors", true); // https://bugzilla.mozilla.org/232227 -pref("privacy.use_utc_timezone", true); -pref("media.webspeech.synth.enabled", false); // Bug 10283: Disable SpeechSynthesis API pref("dom.webaudio.enabled", false); // Bug 13017: Disable Web Audio API -pref("dom.maxHardwareConcurrency", 1); // Bug 21675: Spoof single-core cpu pref("dom.w3c_touch_events.enabled", 0); // Bug 10286: Always disable Touch API pref("dom.w3c_pointer_events.enabled", false); pref("dom.vr.enabled", false); // Bug 21607: Disable WebVR for now @@ -152,6 +132,11 @@ pref("browser.cache.frecency_experiment", -1); pref("dom.use_components_shim", false); // Enable letterboxing pref("privacy.resistFingerprinting.letterboxing", true); +// Disable network information API everywhere. It gets spoofed in bug 1372072 +// but, alas, the behavior is inconsistent across platforms, see: +// https://trac.torproject.org/projects/tor/ticket/27268#comment:19. We should +// not leak that difference if possible. +pref("dom.netinfo.enabled", false); // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation @@ -207,8 +192,7 @@ pref("media.eme.enabled", false); pref("media.mediadrm-widevinecdm.visible", false); // WebIDE can bypass proxy settings for remote debugging. It also downloads // some additional addons that we have not reviewed. Turn all that off. -pref("devtools.webide.autoinstallADBHelper", false); -pref("devtools.webide.autoinstallFxdtAdapters", false); +pref("devtools.webide.autoinstallADBExtension", false); pref("devtools.webide.enabled", false); // The in-browser debugger for debugging chrome code is not coping with our // restrictive DNS look-up policy. We use "127.0.0.1" instead of "localhost" as

1 0

[tor-browser/tor-browser-68.4.1esr-9.5-1] Bug 32414: Make Services.search.addEngine obey FPI
by boklm＠torproject.org 28 Jan '20

28 Jan '20

commit 2197dad64e5c3752b1daeab0c676fda07880144c Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Jan 10 17:54:18 2020 +0100 Bug 32414: Make Services.search.addEngine obey FPI --- browser/base/content/browser-pageActions.js | 70 ++++++++++++---------- mobile/android/chrome/content/browser.js | 15 ++++- .../processsingleton/MainProcessSingleton.jsm | 8 ++- toolkit/components/search/SearchEngine.jsm | 6 +- toolkit/components/search/SearchService.jsm | 5 +- toolkit/components/search/SearchUtils.jsm | 4 +- toolkit/components/search/nsISearchService.idl | 7 ++- 7 files changed, 74 insertions(+), 41 deletions(-) diff --git a/browser/base/content/browser-pageActions.js b/browser/base/content/browser-pageActions.js index 33680b2b4c1a..b2aefba866dd 100644 --- a/browser/base/content/browser-pageActions.js +++ b/browser/base/content/browser-pageActions.js @@ -1248,38 +1248,46 @@ BrowserPageActions.addSearchEngine = { }, _installEngine(uri, image) { - Services.search.addEngine(uri, image, false).then( - engine => { - showBrowserPageActionFeedback(this.action); - }, - errorCode => { - if (errorCode != Ci.nsISearchService.ERROR_DUPLICATE_ENGINE) { - // Download error is shown by the search service - return; + Services.search + .addEngine( + uri, + image, + false, + null, + gBrowser.selectedBrowser.contentPrincipal + ) + .then( + engine => { + showBrowserPageActionFeedback(this.action); + }, + errorCode => { + if (errorCode != Ci.nsISearchService.ERROR_DUPLICATE_ENGINE) { + // Download error is shown by the search service + return; + } + const kSearchBundleURI = + "chrome://global/locale/search/search.properties"; + let searchBundle = Services.strings.createBundle(kSearchBundleURI); + let brandBundle = document.getElementById("bundle_brand"); + let brandName = brandBundle.getString("brandShortName"); + let title = searchBundle.GetStringFromName( + "error_invalid_engine_title" + ); + let text = searchBundle.formatStringFromName( + "error_duplicate_engine_msg", + [brandName, uri], + 2 + ); + Services.prompt.QueryInterface(Ci.nsIPromptFactory); + let prompt = Services.prompt.getPrompt( + gBrowser.contentWindow, + Ci.nsIPrompt + ); + prompt.QueryInterface(Ci.nsIWritablePropertyBag2); + prompt.setPropertyAsBool("allowTabModal", true); + prompt.alert(title, text); } - const kSearchBundleURI = - "chrome://global/locale/search/search.properties"; - let searchBundle = Services.strings.createBundle(kSearchBundleURI); - let brandBundle = document.getElementById("bundle_brand"); - let brandName = brandBundle.getString("brandShortName"); - let title = searchBundle.GetStringFromName( - "error_invalid_engine_title" - ); - let text = searchBundle.formatStringFromName( - "error_duplicate_engine_msg", - [brandName, uri], - 2 - ); - Services.prompt.QueryInterface(Ci.nsIPromptFactory); - let prompt = Services.prompt.getPrompt( - gBrowser.contentWindow, - Ci.nsIPrompt - ); - prompt.QueryInterface(Ci.nsIWritablePropertyBag2); - prompt.setPropertyAsBool("allowTabModal", true); - prompt.alert(title, text); - } - ); + ); }, }; diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index 5f5ac123835c..cacf26587091 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -7253,7 +7253,10 @@ var SearchEngines = { return; } - this.addOpenSearchEngine(engines[data.button]); + this.addOpenSearchEngine( + engines[data.button], + browser.contentPrincipal + ); engines.splice(data.button, 1); if (engines.length < 1) { @@ -7269,9 +7272,15 @@ var SearchEngines = { }); }, - addOpenSearchEngine: async function addOpenSearchEngine(engine) { + addOpenSearchEngine: async function addOpenSearchEngine(engine, principal) { try { - await Services.search.addEngine(engine.url, engine.iconURL, false); + await Services.search.addEngine( + engine.url, + engine.iconURL, + false, + null, + principal + ); // Display a toast confirming addition of new search engine. Snackbars.show( Strings.browser.formatStringFromName( diff --git a/toolkit/components/processsingleton/MainProcessSingleton.jsm b/toolkit/components/processsingleton/MainProcessSingleton.jsm index 1e8caebd6ebc..69372bef1742 100644 --- a/toolkit/components/processsingleton/MainProcessSingleton.jsm +++ b/toolkit/components/processsingleton/MainProcessSingleton.jsm @@ -69,7 +69,13 @@ MainProcessSingleton.prototype = { } Services.search - .addEngine(engineURL.spec, iconURL ? iconURL.spec : null, true) + .addEngine( + engineURL.spec, + iconURL ? iconURL.spec : null, + true, + null, + browser.contentPrincipal + ) .catch(ex => Cu.reportError( "Unable to add search engine to the search service: " + ex diff --git a/toolkit/components/search/SearchEngine.jsm b/toolkit/components/search/SearchEngine.jsm index d84a3a23516c..c4b5b1ce556e 100644 --- a/toolkit/components/search/SearchEngine.jsm +++ b/toolkit/components/search/SearchEngine.jsm @@ -806,6 +806,8 @@ SearchEngine.prototype = { _iconUpdateURL: null, /* The extension ID if added by an extension. */ _extensionID: null, + /* The principal from which the engine was added. */ + _contentPrincipal: null, // Built in search engine extensions. _isBuiltin: false, @@ -851,7 +853,7 @@ SearchEngine.prototype = { '_initFromURIAndLoad: Downloading engine from: "' + loadURI.spec + '".' ); - var chan = SearchUtils.makeChannel(loadURI); + var chan = SearchUtils.makeChannel(loadURI, this._contentPrincipal); if (this._engineToUpdate && chan instanceof Ci.nsIHttpChannel) { var lastModified = this._engineToUpdate.getAttr("updatelastmodified"); @@ -1231,7 +1233,7 @@ SearchEngine.prototype = { this.name + '"' ); - var chan = SearchUtils.makeChannel(uri); + var chan = SearchUtils.makeChannel(uri, this._contentPrincipal); let iconLoadCallback = function(byteArray, engine) { // This callback may run after we've already set a preferred icon, diff --git a/toolkit/components/search/SearchService.jsm b/toolkit/components/search/SearchService.jsm index e869be458c7d..772edada7bfd 100644 --- a/toolkit/components/search/SearchService.jsm +++ b/toolkit/components/search/SearchService.jsm @@ -2311,7 +2311,7 @@ SearchService.prototype = { return this.addEngineWithDetails(params.name, params, isReload); }, - async addEngine(engineURL, iconURL, confirm, extensionID) { + async addEngine(engineURL, iconURL, confirm, extensionID, contentPrincipal) { SearchUtils.log('addEngine: Adding "' + engineURL + '".'); await this.init(true); let errCode; @@ -2325,6 +2325,9 @@ SearchService.prototype = { if (extensionID) { engine._extensionID = extensionID; } + if (contentPrincipal) { + engine._contentPrincipal = contentPrincipal; + } errCode = await new Promise(resolve => { engine._installCallback = function(errorCode) { resolve(errorCode); diff --git a/toolkit/components/search/SearchUtils.jsm b/toolkit/components/search/SearchUtils.jsm index f9550307e875..8b630afbdd6e 100644 --- a/toolkit/components/search/SearchUtils.jsm +++ b/toolkit/components/search/SearchUtils.jsm @@ -133,13 +133,13 @@ var SearchUtils = { * The URL string from which to create an nsIChannel. * @returns an nsIChannel object, or null if the url is invalid. */ - makeChannel(url) { + makeChannel(url, principal) { try { let uri = typeof url == "string" ? Services.io.newURI(url) : url; return Services.io.newChannelFromURI( uri, null /* loadingNode */, - Services.scriptSecurityManager.getSystemPrincipal(), + principal || Services.scriptSecurityManager.getSystemPrincipal(), null /* triggeringPrincipal */, Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL, Ci.nsIContentPolicy.TYPE_OTHER diff --git a/toolkit/components/search/nsISearchService.idl b/toolkit/components/search/nsISearchService.idl index 2e085985a976..4a8f4015fb28 100644 --- a/toolkit/components/search/nsISearchService.idl +++ b/toolkit/components/search/nsISearchService.idl @@ -3,6 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsISupports.idl" +#include "nsIPrincipal.idl" interface nsIURI; interface nsIInputStream; @@ -288,11 +289,15 @@ interface nsISearchService : nsISupports * @param extensionID [optional] * Optional: The correct extensionID if called by an add-on. * + * @param principal [optional] + * Optional: The principal from which the search engine was added. + * * @throws NS_ERROR_FAILURE if the description file cannot be successfully * loaded. */ Promise addEngine(in AString engineURL, in AString iconURL, in boolean confirm, - [optional] in AString extensionID); + [optional] in AString extensionID, + [optional] in nsIPrincipal principal); /** * Adds a new search engine, without asking the user for confirmation and

1 0

[tor-browser-build/master] Bug 32976: Build and bundle geckodriver
by boklm＠torproject.org 27 Jan '20

27 Jan '20

commit f531a004aaa169d9a4a06a3b6d7c04c6fd812f9c Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 19 21:06:37 2020 +0000 Bug 32976: Build and bundle geckodriver Geckodriver is not built by default in release builds. However, it's useful if we build it reproducibly so we can avoid trusting some binary downloaded from the Internet for our QA and Selenium related work. Only the 64bit Linux version is built and included as I doubt we'll need geckodriver on anything else for our purposes. --- projects/firefox/build | 9 +++++++++ projects/firefox/mozconfig-linux-x86_64 | 4 +++- projects/tor-browser/build | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index b42b301..22c5b5d 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -151,6 +151,9 @@ rm -f js/src/configure [% END %] [% IF c("var/linux") %] + [% IF c("var/linux-x86_64") %] + cp obj-*/testing/geckodriver/x86_64-unknown-linux-gnu/release/geckodriver $distdir + [% END %] cp -a obj-*/dist/firefox/* $distdir/Browser/ # Remove firefox-bin (we don't use it, see ticket #10126) rm -f $distdir/Browser/firefox-bin @@ -213,6 +216,8 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cd $distdir [% IF c("var/linux-x86_64") %] + # No need for an unstripped geckodriver + strip geckodriver mkdir -p $distdir/Debug/Browser/gtk2 # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) @@ -258,6 +263,10 @@ END; tar_src => [ 'Debug' ], tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser-debug.tar.xz', }) %] +[% c('tar', { + tar_src => [ 'geckodriver' ], + tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/geckodriver-linux64.tar.xz', + }) %] [% END %] [% c('zip', { diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index 19d2885..59517cd 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -33,6 +33,8 @@ ac_add_options --disable-webrtc # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection +# We want to bundle an own geckodriver, so we can use it for QA and other work +ac_add_options --enable-geckodriver # Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= \ No newline at end of file +ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 2c72e03..4d44f12 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -292,6 +292,7 @@ SCRIPT_EOF cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% IF c("var/linux-x86_64") -%] cp $rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-debug.tar.xz "$OUTDIR"/tor-browser-[% c("var/mar_osname") %]-debug.tar.xz + cp $rootdir/[% c('input_files_by_name/firefox') %]/geckodriver-linux64.tar.xz "$OUTDIR"/ [% END -%] [% IF c("var/linux") -%] cp $rootdir/[% c('input_files_by_name/tor') %]/tor-debug.tar.xz "$OUTDIR"/tor-[% c("var/mar_osname") %]-debug.tar.xz

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_32976_v3'
by boklm＠torproject.org 27 Jan '20

27 Jan '20

commit e1127b38167b902a1b77b14b8c06cfbce9bae653 Merge: 6c24592 f531a00 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jan 27 12:25:59 2020 +0100 Merge remote-tracking branch 'gk/bug_32976_v3' projects/firefox/build | 9 +++++++++ projects/firefox/mozconfig-linux-x86_64 | 4 +++- projects/tor-browser/build | 1 + 3 files changed, 13 insertions(+), 1 deletion(-)

1 0

[tor-browser/tor-browser-68.4.1esr-9.5-1] Bug 461204 - Improve the random number generator for the boundaries in multipart/form-data r=smaug
by boklm＠torproject.org 23 Jan '20

23 Jan '20

commit 3b2165b8be4f7fd7889c17cbb39a4348f7666bc8 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Jan 13 20:41:14 2020 +0000 Bug 461204 - Improve the random number generator for the boundaries in multipart/form-data r=smaug Using a weak RNG for the form boundary allows a website operator to perform several attacks on users (as outlined in https://trac.torproject.org/projects/tor/ticket/22919) These include: - Identifying Windows users based on the unseeded RNG - Identify the number of form submissions that have occurred cross-origin between same-origin submissions Additionally, a predictable boundary makes it possible to forge a boundary in the middle of a file upload. Differential Revision: https://phabricator.services.mozilla.com/D56056 --HG-- extra : moz-landing-system : lando --- dom/html/HTMLFormSubmission.cpp | 7 ++++--- mfbt/RandomNum.cpp | 8 ++++++++ mfbt/RandomNum.h | 6 ++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dom/html/HTMLFormSubmission.cpp b/dom/html/HTMLFormSubmission.cpp index baaed020ec3f..384ca3661426 100644 --- a/dom/html/HTMLFormSubmission.cpp +++ b/dom/html/HTMLFormSubmission.cpp @@ -37,6 +37,7 @@ #include "mozilla/dom/Directory.h" #include "mozilla/dom/File.h" #include "mozilla/StaticPrefs.h" +#include "mozilla/RandomNum.h" namespace mozilla { namespace dom { @@ -367,9 +368,9 @@ FSMultipartFormData::FSMultipartFormData(nsIURI* aActionURL, mTotalLength = 0; mBoundary.AssignLiteral("---------------------------"); - mBoundary.AppendInt(rand()); - mBoundary.AppendInt(rand()); - mBoundary.AppendInt(rand()); + mBoundary.AppendInt(static_cast<uint32_t>(mozilla::RandomUint64OrDie())); + mBoundary.AppendInt(static_cast<uint32_t>(mozilla::RandomUint64OrDie())); + mBoundary.AppendInt(static_cast<uint32_t>(mozilla::RandomUint64OrDie())); } FSMultipartFormData::~FSMultipartFormData() { diff --git a/mfbt/RandomNum.cpp b/mfbt/RandomNum.cpp index 69f19e9d01fa..c3bb9ecef444 100644 --- a/mfbt/RandomNum.cpp +++ b/mfbt/RandomNum.cpp @@ -150,4 +150,12 @@ MFBT_API Maybe<uint64_t> RandomUint64() { #endif } +MFBT_API uint64_t RandomUint64OrDie() { + Maybe<uint64_t> maybeRandomNum = RandomUint64(); + + MOZ_RELEASE_ASSERT(maybeRandomNum.isSome()); + + return maybeRandomNum.value(); +} + } // namespace mozilla diff --git a/mfbt/RandomNum.h b/mfbt/RandomNum.h index 5af510d621a6..5d392c9a6819 100644 --- a/mfbt/RandomNum.h +++ b/mfbt/RandomNum.h @@ -30,6 +30,12 @@ namespace mozilla { */ MFBT_API Maybe<uint64_t> RandomUint64(); +/** + * Like RandomUint64, but always returns a uint64_t or crashes with an assert + * if the underlying RandomUint64 call failed. + */ +MFBT_API uint64_t RandomUint64OrDie(); + } // namespace mozilla #endif // mozilla_RandomNum_h_

1 0

[tor-browser-build/master] Bug 33012: Remove unneeded namecoin and snowflake definitions
by gk＠torproject.org 21 Jan '20

21 Jan '20

commit 6c245925b40b13f8508ca3ade45425338a56acdf Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 21 13:30:28 2020 +0100 Bug 33012: Remove unneeded namecoin and snowflake definitions --- rbm.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rbm.conf b/rbm.conf index 213971e..f0e22a8 100644 --- a/rbm.conf +++ b/rbm.conf @@ -232,8 +232,6 @@ targets: android_min_api_armv7: 16 android_min_api_x86: 16 android_min_api_x86_64: 21 - snowflake: 0 - namecoin: 0 CC: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang' CXX: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang++' container: @@ -332,7 +330,6 @@ targets: # We only build snowflake on the alpha and nightly # channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' - namecoin: 0 deps: - build-essential - python @@ -361,7 +358,6 @@ targets: # We only build snowflake on the alpha and nightly # channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' - namecoin: 0 deps: - build-essential - python

1 0

[tor-browser-build/master] Bug 32435: Add WebAssembly support for RLBox
by boklm＠torproject.org 21 Jan '20

21 Jan '20

commit a1eab9035af5b5d6cc8ab21615676f9f237c074f Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 21 08:03:42 2020 +0000 Bug 32435: Add WebAssembly support for RLBox --- projects/clang/build | 5 ++++- rbm.conf | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/clang/build b/projects/clang/build index 825b21e..d95e9af 100644 --- a/projects/clang/build +++ b/projects/clang/build @@ -40,7 +40,10 @@ cd llvm export LLVM_HOME=$(pwd) mkdir build cd build -cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir -DCMAKE_BUILD_TYPE:STRING=Release $LLVM_HOME +cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \ + -DCMAKE_BUILD_TYPE:STRING=Release \ + [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly \[% END -%] + $LLVM_HOME make -j[% c("buildconf/num_procs") %] make install cd /var/tmp/dist diff --git a/rbm.conf b/rbm.conf index 73c617b..213971e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -262,6 +262,8 @@ targets: var: linux-x86_64: 1 osname: linux-x86_64 + # We only support RLBox on the nightly channel and x86_64 for now + rlbox: '[% c("var/nightly") %]' linux-i686: arch: i686 var:

1 0

[tor-browser-build/master] Fold in stable changelog for 9.0.3 and 9.0.4
by sysrqb＠torproject.org 20 Jan '20

20 Jan '20

commit e8afa21c48b081abb0581287a0b891c02cc28799 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jan 20 14:30:22 2020 +0000 Fold in stable changelog for 9.0.3 and 9.0.4 --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index e8e5741..a123447 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -21,6 +21,30 @@ Tor Browser 9.5a4 -- January 10 2020 * Linux * Bug 32676: Create a tarball with all Linux x86_64 language packs +Tor Browser 9.0.4 -- January 9 2020 + * All Platforms + * Update Firefox to 68.4.1esr + +Tor Browser 9.0.3 -- January 7 2020 + * All Platforms + * Update Firefox to 68.4.0esr + * Bump NoScript to 11.0.11 + * Translations update + * Update OpenPGP keyring + * Bug 32606: Set up default bridge at Georgetown University + * Bug 32659: Remove IPv6 address of default bridge + * Bug 32547: Add new default bridge at UMN + * Bug 31855: Remove End of Year Fundraising Campaign from about:tor + * Windows + OS X + Linux + * Bump Tor to 0.4.2.5 + * Update Tor Launcher to 0.2.20.5 + * Bug 32636: Clean up locales shipped with Tor Launcher + * Android + * Bug 32405: Crash immediately after bootstrap on Android + * Build System + * Linux + * Bug 32676: Create a tarball with all Linux x86_64 language packs + Tor Browser 9.0.2 -- December 3 2019 * All Platforms * Update Firefox to 68.3.0esr

1 0

[tor-browser-build/master] Bug 32979: Update README to add File::Slurp to the list of dependencies
by gk＠torproject.org 17 Jan '20

17 Jan '20

commit 14bb4de90418ce84b8bf603e0f7392c0a08dfbd1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jan 16 19:52:02 2020 +0100 Bug 32979: Update README to add File::Slurp to the list of dependencies --- README | 3 ++- tools/ansible/roles/tbb-builder/tasks/main.yml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README b/README index 5dbf77e..8e97e2f 100644 --- a/README +++ b/README @@ -28,6 +28,7 @@ You also need a few perl modules installed: - File::Temp - Path::Tiny - File::Path +- File::Slurp - File::Copy::Recursive - String::ShellQuote - Sort::Versions @@ -42,7 +43,7 @@ If you are running Debian or Ubuntu, you can install them with: libio-captureoutput-perl libjson-perl libpath-tiny-perl \ libstring-shellquote-perl libsort-versions-perl \ libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \ - libfile-copy-recursive-perl git runc \ + libfile-copy-recursive-perl libfile-slurp-perl git runc \ mercurial The build system is based on rbm, which is included as a git submodule diff --git a/tools/ansible/roles/tbb-builder/tasks/main.yml b/tools/ansible/roles/tbb-builder/tasks/main.yml index 4e84709..92b35e8 100644 --- a/tools/ansible/roles/tbb-builder/tasks/main.yml +++ b/tools/ansible/roles/tbb-builder/tasks/main.yml @@ -19,6 +19,7 @@ - libdata-uuid-perl - libdata-dump-perl - libfile-copy-recursive-perl + - libfile-slurp-perl - libgtk2.0-dev - curl - runc

1 0

[tor-browser-build/master] Add missing Changelog item
by gk＠torproject.org 12 Jan '20

12 Jan '20

commit 4e4ffefc35645faafe4af93d78965c6b073e5be0 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 12 20:03:24 2020 +0000 Add missing Changelog item --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index b60ee3b..e8e5741 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1509,6 +1509,7 @@ Tor Browser 8.0 -- September 5 2018 * Bug 26049: Reduce delay for showing update prompt to 1 hour * Bug 26365: Add potential AltSvc support * Bug 9145: Fix broken hardware acceleration on Windows and enable it + * Bug 22756: Show Canvas prompt only after user interaction * Bug 26045: Add new MAR signing keys * Bug 25215: Revert bug 18619 (we are not disabling IndexedDB any longer) * Bug 19910: Rip out optimistic data socks handshake variant (#3875) @@ -1696,6 +1697,7 @@ Tor Browser 8.0a9 -- June 27 2018 * Bug 17965: Isolate HPKP and HSTS to URL bar domain * Bug 26365: Add potential AltSvc support * Bug 9145: Fix broken hardware acceleration on Windows and enable it + * Bug 22756: Show Canvas prompt only after user interaction * Bug 26045: Add new MAR signing keys * Bug 22564: Hide Firefox Sync * Bug 25090: Disable updater telemetry

1 0

[tor-browser-build/master] Bump release date in ChangeLog
by sysrqb＠torproject.org 08 Jan '20

08 Jan '20

commit 99944666ff3784b48ddd3d7e3be536b7545ac4b6 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jan 8 19:30:14 2020 +0000 Bump release date in ChangeLog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 3a6f424..b60ee3b 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 9.5a4 -- January 9 2020 +Tor Browser 9.5a4 -- January 10 2020 * All Platforms * Update Firefox to 68.4.1esr * Bump NoScript to 11.0.11

1 0

[tor-browser-build/master] Changelog update and versions bump for 68.4.1esr
by sysrqb＠torproject.org 08 Jan '20

08 Jan '20

commit 32ed0c3d083b3eaf4453af5e912590c59030c8d1 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jan 8 19:24:40 2020 +0000 Changelog update and versions bump for 68.4.1esr --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- rbm.conf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 9082c04..f780084 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.4.0 + firefox_platform_version: 68.4.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 9.5 branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 96eddbe..3a6f424 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,6 @@ -Tor Browser 9.5a4 -- January 8 2020 +Tor Browser 9.5a4 -- January 9 2020 * All Platforms - * Update Firefox to 68.4.0esr + * Update Firefox to 68.4.1esr * Bump NoScript to 11.0.11 * Translations update * Update OpenPGP keyring diff --git a/rbm.conf b/rbm.conf index 5ac3328..73c617b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.5a4' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.5a3 project_name: tor-browser

1 0

[tor-browser-build/maint-9.0] Preparing 9.0.4
by gk＠torproject.org 08 Jan '20

08 Jan '20

commit c9dc6d56b935098444d79d3b9234cff7cc25b5fb Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 8 07:36:28 2020 +0000 Preparing 9.0.4 --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++ rbm.conf | 5 +++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index b6ddd17..f50af8c 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.4.0 + firefox_platform_version: 68.4.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 9.0 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index c603a11..78dd726 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser 9.0.4 -- January 9 2020 + * All Platforms + * Update Firefox to 68.4.1esr + Tor Browser 9.0.3 -- January 7 2020 * All Platforms * Update Firefox to 68.4.0esr diff --git a/rbm.conf b/rbm.conf index 57e0aad..d8fccd1 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.0.3' - torbrowser_build: 'build4' + torbrowser_version: '9.0.4' + torbrowser_build: 'build1' torbrowser_incremental_from: - 9.0.2 + - 9.0.3 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/maint-9.0] Use build4 for 9.0.3
by gk＠torproject.org 05 Jan '20

05 Jan '20

commit 064e0a13d42d257e46a1c64bf876f884361413de Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 5 10:27:07 2020 +0000 Use build4 for 9.0.3 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 134401f..57e0aad 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0.3' - torbrowser_build: 'build3' + torbrowser_build: 'build4' torbrowser_incremental_from: - 9.0.2 project_name: tor-browser

1 0

[tor-browser-build/maint-9.0] Use actually our 68.4.0esr branch
by gk＠torproject.org 05 Jan '20

05 Jan '20

commit bcf0405c96522b2754b88cd6b7a84fc46fac3dd4 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 5 10:25:15 2020 +0000 Use actually our 68.4.0esr branch --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index 16c0c34..b6ddd17 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.3.0 + firefox_platform_version: 68.4.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 9.0 torbrowser_update_channel: alpha

1 0

[tor-browser-build/master] Small Changelog fixups
by gk＠torproject.org 05 Jan '20

05 Jan '20

commit 637e37bff412b587970791dafdb3174eb359d6b3 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 5 10:22:13 2020 +0000 Small Changelog fixups --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 48c4249..96eddbe 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ - Tor Browser 9.5a4 -- January 7 2020 +Tor Browser 9.5a4 -- January 8 2020 * All Platforms * Update Firefox to 68.4.0esr * Bump NoScript to 11.0.11 @@ -17,7 +17,7 @@ * Bug 32674: Point the about:tor "Get involved" link to the community portal * Build System * All Platforms - * Bump clang to 8.0.1 + * Bug 32739: Bump clang to 8.0.1 * Linux * Bug 32676: Create a tarball with all Linux x86_64 language packs

1 0

[tor-browser-build/maint-9.0] Fix typo in Changelog
by gk＠torproject.org 05 Jan '20

05 Jan '20

commit 6fd91552452a71b1bfd5c82dec93b3497dad5a30 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 5 10:07:49 2020 +0000 Fix typo in Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 3e338f3..c603a11 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -15,7 +15,7 @@ Tor Browser 9.0.3 -- January 7 2020 * Android * Bug 32405: Crash immediately after bootstrap on Android * Build System - * Windows + OS X + Linux + * Linux * Bug 32676: Create a tarball with all Linux x86_64 language packs Tor Browser 9.0.2 -- December 3 2019

1 0

[tor-browser-build/master] Release preparations for 9.5a4
by sysrqb＠torproject.org 04 Jan '20

04 Jan '20

commit 8e09c52c4dbb0f2879fba661f49889847a308c2c Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sat Jan 4 22:10:03 2020 +0000 Release preparations for 9.5a4 Changelog update and versions bump --- projects/firefox-langpacks/config | 2 +- projects/firefox-locale-bundle/config | 2 +- projects/firefox/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 23 ++++++++++++++++++++++ projects/tor-browser/config | 4 ++-- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- rbm.conf | 4 ++-- 8 files changed, 32 insertions(+), 9 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 17a707a..34d6fad 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets: diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config index 2ea6db6..2f4997f 100644 --- a/projects/firefox-locale-bundle/config +++ b/projects/firefox-locale-bundle/config @@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: use_container: 0 ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 diff --git a/projects/firefox/config b/projects/firefox/config index 0931a3f..9082c04 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.3.0 + firefox_platform_version: 68.4.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 9.5 branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index fd891e0..48c4249 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,26 @@ + Tor Browser 9.5a4 -- January 7 2020 + * All Platforms + * Update Firefox to 68.4.0esr + * Bump NoScript to 11.0.11 + * Translations update + * Update OpenPGP keyring + * Bug 31134: Govern graphite again by security settings + * Bug 31855: Remove End of Year Fundraising Campaign from about:tor + * Bug 32053: Fix LLVM reproducibility issues + * Bug 32547: Add new default bridge at UMN + * Bug 32659: Remove IPv6 address of default bridge + * Windows + OS X + Linux + * Update Tor to 0.4.2.5 + * Update Tor Launcher to 0.2.21 + * Bug 32636: Clean up locales shipped with Tor Launcher + * Translations update + * Bug 32674: Point the about:tor "Get involved" link to the community portal + * Build System + * All Platforms + * Bump clang to 8.0.1 + * Linux + * Bug 32676: Create a tarball with all Linux x86_64 language packs + Tor Browser 9.0.2 -- December 3 2019 * All Platforms * Update Firefox to 68.3.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 85d8bff..d3e8e61 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -74,9 +74,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 1522903c3486c790e842f9d5204cfbc93672676df4090f99c4d1ee3578ac8c07 + sha256sum: 1b0daa12e1b8fbc8e30e7bdb5689b12774aaa9f883cb3e9ad57943a883ce65b5 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index f253c09..874ad15 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.20.3 +version: 0.2.21 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index 7058eda..4a1045c 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.4.2.4-rc +version: 0.4.2.5 git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 31f60bb..5ac3328 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.5a3' + torbrowser_version: '9.5a4' torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.5a2 + - 9.5a3 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-launcher/master] Release preparations for 0.2.21
by sysrqb＠torproject.org 04 Jan '20

04 Jan '20

commit 667632ce72f3b77eac9043e58b0c86258c818581 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sat Jan 4 20:21:09 2020 +0000 Release preparations for 0.2.21 Version bump. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 5b498a5..fb35c37 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.20.4</em:version> + <em:version>0.2.21</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[torbutton/master] Translations update
by sysrqb＠torproject.org 04 Jan '20

04 Jan '20

commit f4d81a9f8130dd3350eae0bf967ef857308ea4d0 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sat Jan 4 22:00:53 2020 +0000 Translations update --- chrome/locale/cs/brand.dtd | 2 +- chrome/locale/cs/browserOnboarding.properties | 32 +++++++++++++-------------- chrome/locale/cs/torbutton.dtd | 10 ++++----- chrome/locale/cs/torbutton.properties | 12 +++++----- chrome/locale/de/torbutton.dtd | 2 +- chrome/locale/fa/aboutDialog.dtd | 16 +++++++------- chrome/locale/id/browserOnboarding.properties | 4 ++-- chrome/locale/id/torbutton.dtd | 2 +- chrome/locale/is/torbutton.dtd | 2 +- chrome/locale/is/torbutton.properties | 10 ++++----- chrome/locale/ja/torbutton.dtd | 2 +- chrome/locale/ja/torbutton.properties | 10 ++++----- chrome/locale/lt/aboutTBUpdate.dtd | 2 +- chrome/locale/lt/aboutTor.dtd | 4 ++-- chrome/locale/lt/browserOnboarding.properties | 14 ++++++------ chrome/locale/lt/torbutton.dtd | 4 ++-- chrome/locale/lt/torbutton.properties | 14 ++++++------ chrome/locale/mk/torbutton.dtd | 2 +- chrome/locale/mk/torbutton.properties | 10 ++++----- chrome/locale/nl/aboutTor.dtd | 2 +- chrome/locale/ro/browserOnboarding.properties | 12 +++++----- chrome/locale/ro/torbutton.dtd | 2 +- chrome/locale/ro/torbutton.properties | 10 ++++----- chrome/locale/ru/torbutton.properties | 4 ++-- chrome/locale/sv-SE/aboutDialog.dtd | 2 +- chrome/locale/zh-CN/torbutton.dtd | 2 +- chrome/locale/zh-CN/torbutton.properties | 10 ++++----- chrome/locale/zh-TW/torbutton.properties | 10 ++++----- 28 files changed, 104 insertions(+), 104 deletions(-) diff --git a/chrome/locale/cs/brand.dtd b/chrome/locale/cs/brand.dtd index 62af5f04..1618acec 100644 --- a/chrome/locale/cs/brand.dtd +++ b/chrome/locale/cs/brand.dtd @@ -6,7 +6,7 @@ <!ENTITY brandShortName "Prohlížeč Tor"> <!ENTITY brandFullName "Prohlížeč Tor"> <!ENTITY vendorShortName "Tor Project"> -<!ENTITY trademarkInfo.part1 ""Tor" a "Onion logo" jsou registrované ochranné známky společnosti Tor Project, Inc."> +<!ENTITY trademarkInfo.part1 "Tor a logo Onion jsou ochrannými známkami společnosti Tor Project, Inc.">  <!ENTITY plugins.installed.find "Klepnutím načtete nainstalované systémové zásuvné moduly"> diff --git a/chrome/locale/cs/browserOnboarding.properties b/chrome/locale/cs/browserOnboarding.properties index de61ab4e..cbe32c7e 100644 --- a/chrome/locale/cs/browserOnboarding.properties +++ b/chrome/locale/cs/browserOnboarding.properties @@ -15,13 +15,13 @@ onboarding.tour-tor-privacy.button=Přejít na síť Tor onboarding.tour-tor-network=Síť Tor onboarding.tour-tor-network.title=Používejte decentralizovanou síť. onboarding.tour-tor-network.description=Prohlížeč Tor se k internetu připojuje skrze síť Tor sestavenou díky tisícům dobrovolníků po celém světě. Na rozdíl od VPN nemá síť Tor žádný centrální prvek, kterému musíte do rukou svěřit své soukromí. -onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. -onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings -onboarding.tour-tor-network.button=Zobrazit okruhy +onboarding.tour-tor-network.description-para2=NOVÉ: Nastavení sítě Tor, včetně možnosti vyžádat si most, pokud je Tor blokován, nyní najdete v Předvolbách. +onboarding.tour-tor-network.action-button=Přizpůsobte si nastavení sítě Tor +onboarding.tour-tor-network.button=Zobrazit řetězec -onboarding.tour-tor-circuit-display=Zobrazení okruhů +onboarding.tour-tor-circuit-display=Zobrazení řetězce onboarding.tour-tor-circuit-display.title=Podívejte se na svou cestu. -onboarding.tour-tor-circuit-display.description=Pro každou doménu, kterou navštívíte, je vytvořeno šifrované spojení přes tři uzly Toru různě po světě. Žádná webová stránka neví, odkud se k ní připojujete. Nové spojení si můžete vyžádat klepnutím na „Nový okruh pro tuto stránku“ v zobrazení okruhů. +onboarding.tour-tor-circuit-display.description=Pro každou doménu, kterou navštívíte, je vytvořeno šifrované spojení přes tři uzly Toru různě po světě. Žádná webová stránka neví, odkud se k ní připojujete. Nové spojení si můžete vyžádat klepnutím na „Nový řetězec sítí Tor k této stránce“ v zobrazení řetězce. onboarding.tour-tor-circuit-display.button=Moje cesta onboarding.tour-tor-circuit-display.next-button=Přejít na Zabezpečení @@ -45,14 +45,14 @@ onboarding.tour-tor-onion-services.button=Navštívit Onion onboarding.tour-tor-onion-services.next-button=Hotovo onboarding.overlay-icon-tooltip-updated2=Podívejte se, co je nového\nv %S -onboarding.tour-tor-update.prefix-new=Nove +onboarding.tour-tor-update.prefix-new=Nové onboarding.tour-tor-update.prefix-updated=Aktualizováno onboarding.tour-tor-toolbar=Panel nástrojů -onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button. -onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser. -onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu. -onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity +onboarding.tour-tor-toolbar-update-9.0.title=Rozlučte se s tlačítkem Onion. +onboarding.tour-tor-toolbar-update-9.0.description=Funkce Toru jsme se snažíme plně integrovat přímo to prohlížeče Tor. +onboarding.tour-tor-toolbar-update-9.0.description-para2=Proto už není potřeba hledat informace o Toru pod vlastním tlačítkem, ale najdete je pod ikonou [i] přímo v adresním řádku. Možnost vyžádat si novou identitu se zase přesunula do hlavního tlačítka [≡]. +onboarding.tour-tor-toolbar-update-9.0.button=Jak si vyžádat novou identitu onboarding.tour-tor-toolbar-update-9.0.next-button=Přejít na síť Tor # Circuit Display onboarding. @@ -62,11 +62,11 @@ onboarding.tor-circuit-display.one-of-three=1 ze 3 onboarding.tor-circuit-display.two-of-three=2 ze 3 onboarding.tor-circuit-display.three-of-three=3 ze 3 -onboarding.tor-circuit-display.intro.title=Jak okruhy fungují? -onboarding.tor-circuit-display.intro.msg=Okruhy jsou sestaveny z náhodně vybraných uzlů, počítačů rozmístěných po světě a nastavených pro přeposílání toku v síti Tor. Okruhy vám zajišťují soukromí při prohlížení a spojení s onion službami. +onboarding.tor-circuit-display.intro.title=Jak řetězce fungují? +onboarding.tor-circuit-display.intro.msg=Řetězce jsou sestaveny z náhodně vybraných uzlů, počítačů rozmístěných po světě a nastavených pro přeposílání toku v síti Tor. Řetězce vám zajišťují soukromí při prohlížení a spojení s onion službami. -onboarding.tor-circuit-display.diagram.title=Zobrazení okruhů -onboarding.tor-circuit-display.diagram.msg=Tento diagram ukazuje uzly tvořící okruh pro tuto stránku. Aby nebylo možné spojit vaše aktivity na různých stránkách, pro každou je vytvořen okruh nový. +onboarding.tor-circuit-display.diagram.title=Zobrazení řetězce +onboarding.tor-circuit-display.diagram.msg=Tento diagram ukazuje uzly tvořící řetězec k této stránce. Aby nebylo možné spojit vaše aktivity na různých stránkách, ke každé je vytvořen řetězec nový. -onboarding.tor-circuit-display.new-circuit.title=Potřebujete nový okruh? -onboarding.tor-circuit-display.new-circuit.msg=Pokud se vám nedaří k nějaké stránce připojit, nebo se stránka nenačítá správně, můžete použít toto tlačítko k obnovení stránky skrze nový okruh. +onboarding.tor-circuit-display.new-circuit.title=Potřebujete nový řetězec? +onboarding.tor-circuit-display.new-circuit.msg=Pokud se vám nedaří k nějaké stránce připojit, nebo se stránka nenačítá správně, můžete použít toto tlačítko k obnovení stránky skrze nový řetězec. diff --git a/chrome/locale/cs/torbutton.dtd b/chrome/locale/cs/torbutton.dtd index 278137bb..a2a4109c 100644 --- a/chrome/locale/cs/torbutton.dtd +++ b/chrome/locale/cs/torbutton.dtd @@ -1,6 +1,6 @@ -<!ENTITY torbutton.context_menu.new_identity "Nova identita"> +<!ENTITY torbutton.context_menu.new_identity "Nová identita"> <!ENTITY torbutton.context_menu.new_identity_key "i"> -<!ENTITY torbutton.context_menu.new_circuit "Nový okruh Toru pro tuto stránku"> +<!ENTITY torbutton.context_menu.new_circuit "Nový řetězec sítí Tor k této stránce"> <!ENTITY torbutton.context_menu.new_circuit_key "o"> <!ENTITY torbutton.context_menu.networksettings "Nastavení sítě Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> @@ -45,8 +45,8 @@ <!ENTITY torbutton.prefs.sec_custom_summary "Vaše nastavení prohlížeče neodpovídá standardnímu nastavení zabezpečení. Z důvodu ochrany soukromí a zvýšení bezpečnosti vám doporučujeme vybrat si jednu z výchozích bezpečnostních úrovní."> <!ENTITY torbutton.prefs.sec_restore_defaults "Obnovit výchozí"> <!ENTITY torbutton.prefs.sec_advanced_security_settings "Rozšířená bezpečnostní nastavení…"> -<!ENTITY torbutton.circuit_display.title "Tor okruh"> -<!ENTITY torbutton.circuit_display.new_circuit "Nový okruh Toru pro tuto stránku"> +<!ENTITY torbutton.circuit_display.title "Řetězec sítí Tor"> +<!ENTITY torbutton.circuit_display.new_circuit "Nový řetězec sítí Tor k této stránce">  -<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.tooltip "Otevřít výzvu k ověření klienta služby onion"> diff --git a/chrome/locale/cs/torbutton.properties b/chrome/locale/cs/torbutton.properties index 93f24e36..20e5c747 100644 --- a/chrome/locale/cs/torbutton.properties +++ b/chrome/locale/cs/torbutton.properties @@ -61,10 +61,10 @@ pageInfo_OnionEncryption=Šifrované spojení (Onion služba) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.clientAuthMissing=Tor onion service missing client authorization -onionServices.authPrompt.description=%S is requesting your private key. -onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service +onionServices.clientAuthMissing=Tor klient služby onion není ověřený +onionServices.authPrompt.description=%S vyžaduje váš soukromý klíč. +onionServices.authPrompt.keyPlaceholder=Zadejte svůj soukromý klíč pro tuto službu onion onionServices.authPrompt.done=Hotovo -onionServices.authPrompt.doneAccessKey=h -onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) -onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPrompt.doneAccessKey=H +onionServices.authPrompt.invalidKey=Zadejte prosím platný klíč (52 znaků base32, nebo 44 znaků base64) +onionServices.authPrompt.failedToSetKey=Tor s vaším klíčem nelze nastavit diff --git a/chrome/locale/de/torbutton.dtd b/chrome/locale/de/torbutton.dtd index b1cc3863..78c11283 100644 --- a/chrome/locale/de/torbutton.dtd +++ b/chrome/locale/de/torbutton.dtd @@ -49,4 +49,4 @@ <!ENTITY torbutton.circuit_display.new_circuit "Neuen Kanal für diese Seite">  -<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.tooltip "Aufforderung zur Bestätigung an verfügbares Onion-Dienst-Klienten-Programm"> diff --git a/chrome/locale/fa/aboutDialog.dtd b/chrome/locale/fa/aboutDialog.dtd index 3be48874..315ad50f 100644 --- a/chrome/locale/fa/aboutDialog.dtd +++ b/chrome/locale/fa/aboutDialog.dtd @@ -1,19 +1,19 @@ <!ENTITY project.start "&brandShortName; توسعه یافته توسط">  <!ENTITY project.tpoLink " &vendorShortName;"> -<!ENTITY project.end "، یک کار غیر انتفاعی برای دفاع از حریم خصوصی شما و آزادی آنلاین است."> +<!ENTITY project.end "، کوششی غیر انتفاعی برای دفاع از حریم خصوصی شما و آزادی در اینترنت است."> -<!ENTITY help.start "آیا کمک می خواهید؟"> +<!ENTITY help.start "آیا می‌خواهید کمک کنید؟">  -<!ENTITY help.donateLink "اهدا"> +<!ENTITY help.donateLink "همیاری کنید"> <!ENTITY help.or "یا">  -<!ENTITY help.getInvolvedLink "درگیر شدن"> +<!ENTITY help.getInvolvedLink "دست اندر کار شوید!"> <!ENTITY help.end "!">  -<!ENTITY bottomLinks.questions "پرسش؟"> +<!ENTITY bottomLinks.questions "پرسشی دارید؟">  -<!ENTITY bottomLinks.grow "کمک به رشد شبکه Tor!"> +<!ENTITY bottomLinks.grow "به رشد شبکه‌ی تور کمک کنید!">  -<!ENTITY bottomLinks.license "صدور مجوز اطلاعات"> -<!ENTITY tor.TrademarkStatement "'Tor' و 'Onion Logo' علامت های تجاری ثبت شده از پروژه Tor هستند"> +<!ENTITY bottomLinks.license "مجوزها"> +<!ENTITY tor.TrademarkStatement "'Tor' و 'لوگوی Onion' علامت های تجاری ثبت شده از پروژه‌ی تور هستند."> diff --git a/chrome/locale/id/browserOnboarding.properties b/chrome/locale/id/browserOnboarding.properties index e23064c2..90c77e69 100644 --- a/chrome/locale/id/browserOnboarding.properties +++ b/chrome/locale/id/browserOnboarding.properties @@ -15,7 +15,7 @@ onboarding.tour-tor-privacy.button=Pergi ke Jaringan Tor onboarding.tour-tor-network=Jaringan Tor onboarding.tour-tor-network.title=Mengelilingi jaringan yang terdesentralisasi. onboarding.tour-tor-network.description=Tor Browser menghubungkan Anda ke jaringan Tor yang dijalankan oleh ribuan relawan di seluruh dunia. Tidak seperti VPN, tidak ada satu titik kesalahan atau entitas sentral yang perlu anda percaya untuk menikmati internet secara privat. -onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. +onboarding.tour-tor-network.description-para2=Baru: Pengaturan Jaringan Tor, termasuk kemampuan untuk meminta menjembatani dimana Tor diblokir, sekarang dapat ditemukan di Preferensi. onboarding.tour-tor-network.action-button=Sesuaikan Pengaturan Jaringan Tor Anda onboarding.tour-tor-network.button=Pergi ke Tampilan Sirkuit @@ -51,7 +51,7 @@ onboarding.tour-tor-update.prefix-updated=Telah diperbarui onboarding.tour-tor-toolbar=Toolbar onboarding.tour-tor-toolbar-update-9.0.title=Selamat tinggal Onion Button. onboarding.tour-tor-toolbar-update-9.0.description=Kami menginginkan pengalaman Anda menggunakan Tor terintegrasi secara penuh dalam Tor Browser. -onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu. +onboarding.tour-tor-toolbar-update-9.0.description-para2=Itulah sebabnya sekarang, daripada mengunakan tombol onion, kamu dapat melihat sirkuit Tor lewat [i] di URL bar dan Meminta sebuah identitas baru menggunakan tombol alat atau [≡] menu. onboarding.tour-tor-toolbar-update-9.0.button=Bagaimana Meminta Identitas Baru onboarding.tour-tor-toolbar-update-9.0.next-button=Pergi ke Jaringan Tor diff --git a/chrome/locale/id/torbutton.dtd b/chrome/locale/id/torbutton.dtd index a4db2a01..6331c861 100644 --- a/chrome/locale/id/torbutton.dtd +++ b/chrome/locale/id/torbutton.dtd @@ -49,4 +49,4 @@ <!ENTITY torbutton.circuit_display.new_circuit "Sirkuit Baru untuk Situs Ini">  -<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.tooltip "Buka permintaan otentikasi klien oninon service"> diff --git a/chrome/locale/is/torbutton.dtd b/chrome/locale/is/torbutton.dtd index 6cc6b57d..3f998e5c 100644 --- a/chrome/locale/is/torbutton.dtd +++ b/chrome/locale/is/torbutton.dtd @@ -49,4 +49,4 @@ <!ENTITY torbutton.circuit_display.new_circuit "Ný rás fyrir þetta vefsvæði">  -<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.tooltip "Opna glugga fyrir auðkenningu biðlaraforrits fyrir onion-þjónustu"> diff --git a/chrome/locale/is/torbutton.properties b/chrome/locale/is/torbutton.properties index e17ffaef..d29cb711 100644 --- a/chrome/locale/is/torbutton.properties +++ b/chrome/locale/is/torbutton.properties @@ -61,10 +61,10 @@ pageInfo_OnionEncryption=Dulrituð tenging (Onion-þjónusta) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.clientAuthMissing=Tor onion service missing client authorization -onionServices.authPrompt.description=%S is requesting your private key. -onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service +onionServices.clientAuthMissing=Tor onion-þjónustu vantar auðkenningu frá biðlaraforriti +onionServices.authPrompt.description=%S er að biðja um einkalykilinn þinn. +onionServices.authPrompt.keyPlaceholder=Settu inn einkalykilinn þinn fyrir þessa onion-þjónustu onionServices.authPrompt.done=Lokið onionServices.authPrompt.doneAccessKey=d -onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) -onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPrompt.invalidKey=Settu inn gildan lykil (52 base32 stafir eða 44 base64 stafir) +onionServices.authPrompt.failedToSetKey=Tekst ekki að setja upp Tor með lyklinum þínum. diff --git a/chrome/locale/ja/torbutton.dtd b/chrome/locale/ja/torbutton.dtd index 2c239c2b..10621b69 100644 --- a/chrome/locale/ja/torbutton.dtd +++ b/chrome/locale/ja/torbutton.dtd @@ -49,4 +49,4 @@ <!ENTITY torbutton.circuit_display.new_circuit "このサイトに新しいサーキットを使う">  -<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.tooltip "オニオンサービスのクライアント認証プロンプトを開く"> diff --git a/chrome/locale/ja/torbutton.properties b/chrome/locale/ja/torbutton.properties index 14aa4e67..15372225 100644 --- a/chrome/locale/ja/torbutton.properties +++ b/chrome/locale/ja/torbutton.properties @@ -61,10 +61,10 @@ pageInfo_OnionEncryption=接続が暗号化されています (Onion サービ # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.clientAuthMissing=Tor onion service missing client authorization -onionServices.authPrompt.description=%S is requesting your private key. -onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service +onionServices.clientAuthMissing=Tor オニオンサービスにクライアント認証がありません +onionServices.authPrompt.description=%Sは秘密鍵を要求しています。 +onionServices.authPrompt.keyPlaceholder=このオニオンサービスのあなたの秘密鍵を入力してください onionServices.authPrompt.done=完了 onionServices.authPrompt.doneAccessKey=d -onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) -onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPrompt.invalidKey=有効なキーを入力してください（52 Base32文字または44 Base64文字） +onionServices.authPrompt.failedToSetKey=あなたのキーでTorを構成できませんでした diff --git a/chrome/locale/lt/aboutTBUpdate.dtd b/chrome/locale/lt/aboutTBUpdate.dtd index a555d655..a515d267 100644 --- a/chrome/locale/lt/aboutTBUpdate.dtd +++ b/chrome/locale/lt/aboutTBUpdate.dtd @@ -1,4 +1,4 @@ -<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser keitinių žurnalas"> +<!ENTITY aboutTBUpdate.changelogTitle "Tor Naršyklės keitinių žurnalas"> <!ENTITY aboutTBUpdate.updated "Tor Naršyklė atnaujinta."> <!ENTITY aboutTBUpdate.linkPrefix "Norėdami sužinoti naujausią informaciją apie šią laida, "> <!ENTITY aboutTBUpdate.linkLabel "apsilankykite mūsų internetinėje svetainėje"> diff --git a/chrome/locale/lt/aboutTor.dtd b/chrome/locale/lt/aboutTor.dtd index 24db7e51..1f943ecf 100644 --- a/chrome/locale/lt/aboutTor.dtd +++ b/chrome/locale/lt/aboutTor.dtd @@ -17,10 +17,10 @@ <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Turite klausimų?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Peržiūrėkite mūsų Tor Browser naudotojo vadovą »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Peržiūrėkite mūsų Tor Naršyklės naudotojo vadovą »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "V"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser naudotojo vadovas"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Naršyklės naudotojo vadovas"> <!ENTITY aboutTor.tor_mission.label "Tor Project yra JAV 501(c)(3) ne pelno organizacija remianti žmogaus teises ir laisves, kurianti ir diegianti laisvas ir atvirojo kodo anonimiškumo bei privatumo technologijas, palaikanti jų neribotą prieinamumą ir naudojimą bei mokslinį ir visuotinį supratimą."> <!ENTITY aboutTor.getInvolved.label "Įsitraukite »"> diff --git a/chrome/locale/lt/browserOnboarding.properties b/chrome/locale/lt/browserOnboarding.properties index b351e854..a53b857f 100644 --- a/chrome/locale/lt/browserOnboarding.properties +++ b/chrome/locale/lt/browserOnboarding.properties @@ -36,11 +36,11 @@ onboarding.tour-tor-expect-differences=Patyrimo patarimai onboarding.tour-tor-expect-differences.title=Tikėkitės kai kurių skirtumų. onboarding.tour-tor-expect-differences.description=Su visomis Tor suteikiamomis saugumo ir privatumo ypatybėmis, jūsų patyrimas naršant saityną gali būti šiek tiek kitoks. Priklausomai nuo jūsų saugumo lygmens, viskas gali veikti šiek tiek lėčiau, o kai kurie elementai - neveikti arba būti neįkeliami. Taip pat jūsų gali būti prašoma įrodyti, kad esate žmogus, o ne robotas. onboarding.tour-tor-expect-differences.button=Rodyti DUK -onboarding.tour-tor-expect-differences.next-button=Pereiti į Onion tarnybas +onboarding.tour-tor-expect-differences.next-button=Pereiti į Onion paslaugas -onboarding.tour-tor-onion-services=Onion tarnybos +onboarding.tour-tor-onion-services=Onion paslaugos onboarding.tour-tor-onion-services.title=Būkite papildomai apsaugoti. -onboarding.tour-tor-onion-services.description=Onion tarnybos yra svetainės, kurių adresai baigiasi .onion - turinio leidėjams bei lankytojams jos suteikia papildomą apsaugą, įskaitant apsaugą prieš cenzūros. Onion tarnybos leidžia visiems skelbti turinį bei teikti paslaugas anonimiškai. Spustelėkite žemiau, norėdami apsilankyti DuckDuckGo onion svetainėje. +onboarding.tour-tor-onion-services.description=Onion paslaugos yra svetainės, kurių adresai baigiasi .onion. Turinio leidėjams bei lankytojams jos suteikia papildomą apsaugą, įskaitant apsaugos priemones nuo cenzūros. Onion paslaugos leidžia visiems skelbti turinį bei teikti paslaugas anonimiškai. Spustelėkite žemiau, norėdami apsilankyti DuckDuckGo onion svetainėje. onboarding.tour-tor-onion-services.button=Apsilankyti Onion onboarding.tour-tor-onion-services.next-button=Atlikta @@ -49,9 +49,9 @@ onboarding.tour-tor-update.prefix-new=Nauja onboarding.tour-tor-update.prefix-updated=Atnaujinta onboarding.tour-tor-toolbar=Įrankių juosta -onboarding.tour-tor-toolbar-update-9.0.title=Viso gero Svogūno mygtuke. -onboarding.tour-tor-toolbar-update-9.0.description=Norime kad jūsų patirtis naudojantis Tor būtų pilnai integruota Tor naršyklėje. -onboarding.tour-tor-toolbar-update-9.0.description-para2=Dėl to dabar, vietoj svogūno mygtuko naudojimo, galite Tor grandinę pamatyti per [i] URL juostoje ir duoti užklausą naujai tapatybei naudodamiesi įrankių juostos mygtuku arba [≡] meniu. +onboarding.tour-tor-toolbar-update-9.0.title=Viso gero, svogūno mygtuke. +onboarding.tour-tor-toolbar-update-9.0.description=Norime kad jūsų patirtis naudojantis Tor būtų pilnai integruota Tor Naršyklėje. +onboarding.tour-tor-toolbar-update-9.0.description-para2=Dėl to, dabar, vietoj to, kad naudotumėte svogūno mygtuką, galite matyti savo Tor grandinę per [i] URL adresų juostoje ir užklausti naują tapatybę naudodamiesi įrankių juostoje esančių mygtuku arba [≡] meniu. onboarding.tour-tor-toolbar-update-9.0.button=Kaip duoti užklausą naujai tapatybei onboarding.tour-tor-toolbar-update-9.0.next-button=Pereiti prie Tor tinklo @@ -63,7 +63,7 @@ onboarding.tor-circuit-display.two-of-three=2 iš 3 onboarding.tor-circuit-display.three-of-three=3 iš 3 onboarding.tor-circuit-display.intro.title=Kaip veikia grandinės? -onboarding.tor-circuit-display.intro.msg=Grandinės yra sudarytos iš atsitiktinai priskirtų retransliavimų, kurie savo ruožtu yra kompiuteriai visame pasaulyje sukonfigūruoti persiųsti Tor duomenų srautą. Grandinės jums leidžia naršyti privačiai ir prisijungti prie onion tarnybų. +onboarding.tor-circuit-display.intro.msg=Grandinės yra sudarytos iš atsitiktinai priskirtų retransliavimų, kurie savo ruožtu yra kompiuteriai visame pasaulyje sukonfigūruoti persiųsti Tor duomenų srautą. Grandinės jums leidžia naršyti privačiai ir prisijungti prie onion paslaugų. onboarding.tor-circuit-display.diagram.title=Grandinės rodinys onboarding.tor-circuit-display.diagram.msg=Ši diagrama rodo retransliavimus, kurie sudaro šios internetinės svetainės grandinę. Norint neleisti susieti veiklos tarp įvairių svetainių, kiekviena svetainė gauna skirtingą grandinę. diff --git a/chrome/locale/lt/torbutton.dtd b/chrome/locale/lt/torbutton.dtd index a03f0c34..b4915239 100644 --- a/chrome/locale/lt/torbutton.dtd +++ b/chrome/locale/lt/torbutton.dtd @@ -29,7 +29,7 @@ <!ENTITY torbutton.prefs.sec_safer_description "Išjungia tas internetinių svetainių ypatybes, kurios, dažnai, būna pavojingos, dėl to kai kurios svetainės gali prarasti funkcionalumą."> <!ENTITY torbutton.prefs.sec_safer_list_label "Saugesniame nustatyme:"> <!ENTITY torbutton.prefs.sec_safest_label "Saugiausias"> -<!ENTITY torbutton.prefs.sec_safest_description "Leidžia tik tas internetinių svetainių ypatybes, kurios yra reikalingos statinėms svetainėms bei pagrindinėms paslaugoms. Šie pakeitimai paveikia paveikslus, medija ir scenarijus."> +<!ENTITY torbutton.prefs.sec_safest_description "Leidžia tik tas internetinių svetainių ypatybes, kurios yra reikalingos statinėms svetainėms bei pagrindinėms paslaugoms. Šie pakeitimai paveikia paveikslus, mediją ir scenarijus."> <!ENTITY torbutton.prefs.sec_safest_list_label "Saugiausiame nustatyme:"> <!ENTITY torbutton.prefs.sec_learn_more_label "Sužinoti daugiau"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript yra išjungtas ne HTTPS svetainėse."> @@ -49,4 +49,4 @@ <!ENTITY torbutton.circuit_display.new_circuit "Nauja grandinė šiai svetainei">  -<!ENTITY torbutton.onionServices.authPrompt.tooltip "Atidarykite onion paslaugos kliento autentifikavimo eilutę"> +<!ENTITY torbutton.onionServices.authPrompt.tooltip "Atverkite onion paslaugos kliento tapatybės nustatymo užklausą"> diff --git a/chrome/locale/lt/torbutton.properties b/chrome/locale/lt/torbutton.properties index 7bc5a23e..2fa5ff16 100644 --- a/chrome/locale/lt/torbutton.properties +++ b/chrome/locale/lt/torbutton.properties @@ -20,14 +20,14 @@ torbutton.popup.external.note = Kai kurie failų tipai, gali priversti programas torbutton.popup.external.suggest = Saugumo sumetimais, parsisiųstus failus derėtų atverti, atsijungus nuo interneto arba naudojant Tor Live CD tokį kaip Tails.\n torbutton.popup.launch = Atsisiųsti failą torbutton.popup.cancel = Atsisakyti -torbutton.popup.dontask = Nuo šiol, failus atsisiųsti automatiškai +torbutton.popup.dontask = Nuo šiol, atsisiųsti failus automatiškai torbutton.popup.no_newnym = Torbutton negali jums saugiai suteikti naujos tapatybės. Programa neturi prieigos prie Tor valdymo prievado.\n\nAr jūs esate paleidę Tor Naršyklės rinkinį? torbutton.security_settings.menu.title = Saugumo nustatymai torbutton.title.prompt_torbrowser = Svarbi Torbutton informacija -torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. +torbutton.popup.prompt_torbrowser = Dabar, Torbutton veikia kitaip: daugiau nebegalite jo išjungti.\n\nMes atlikome šį pakeitimą, nes nėra saugu naudoti Torbutton naršyklėje, kuri taip pat yra naudojama naršymui ne Tor tinkle. Ten buvo pernelyg daug klaidų, kurių jokiu kitu būdu negalėjome pataisyti.\n\nJeigu ir toliau norite įprastai naudotis Firefox, turėtumėte pašalinti Torbutton ir atsisiųsti Tor Naršyklės rinkinį. Tor Naršyklės privatumo savybės yra stipresnės už įprastos Firefox savybes, netgi tuomet, kai Firefox naudojama su Torbutton.\n\nNorėdami pašalinti Torbutton, pereikite į Priemonės->Priedai->Plėtiniai ir tuomet šalia Torbutton spustelėkite mygtuką "Pašalinti". torbutton.popup.short_torbrowser = Svarbi Torbutton informacija!\n\nDabar, Torbutton visada yra įjungta.\n\nIšsamesnei informacijai, spustelėkite ant Torbutton. -torbutton.popup.confirm_plugins = Tokie įskiepiai kaip Flash gali pažeisti jūsų privatumą ir anonimiškumą.\n\nJie taip pat gali apeiti Tor tam, kad atskleistų jūsų dabartinę buvimo vietą ir IP adresą.\n\nAr tikrai norite įjungti įskiepius?\n\n +torbutton.popup.confirm_plugins = Tokie papildiniai kaip Flash gali pažeisti jūsų privatumą ir anonimiškumą.\n\nJie taip pat gali apeiti Tor tam, kad atskleistų jūsų dabartinę buvimo vietą ir IP adresą.\n\nAr tikrai norite įjungti papildinius?\n\n torbutton.popup.never_ask_again = Daugiau nebeklausti torbutton.popup.confirm_newnym = Tor Naršyklė užvers visus langus ir korteles. Visi svetainių seansai bus prarasti.\n\nPaleisti Tor Naršyklę iš naujo dabar, kad būtų atstatyta jūsų tapatybė?\n\n @@ -56,14 +56,14 @@ profileMigrationFailed=Jūsų esamo %S profilio perkėlimas nepavyko.\nBus naudo updateDownloadingPanelUILabel=Atsisiunčiamas %S atnaujinimas # .Onion Page Info prompt. Strings are kept here for ease of translation. -pageInfo_OnionEncryptionWithBitsAndProtocol=Šifruotas ryšys (Onion tarnyba, %1$S, %2$S bitų raktai, %3$S) -pageInfo_OnionEncryption=Šifruotas ryšys (Onion tarnyba) +pageInfo_OnionEncryptionWithBitsAndProtocol=Šifruotas ryšys (Onion paslauga, %1$S, %2$S bitų raktai, %3$S) +pageInfo_OnionEncryption=Šifruotas ryšys (Onion paslauga) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.clientAuthMissing=Tor onion paslaugai trūksta kliento leidimo +onionServices.clientAuthMissing=Tor onion paslaugai trūksta kliento prieigos teisių onionServices.authPrompt.description=%S prašo jūsų asmeninio rakto. -onionServices.authPrompt.keyPlaceholder=Įveskite asmeninį raktą skirtą šiai onion paslaugai +onionServices.authPrompt.keyPlaceholder=Įveskite savo privatųjį, šiai onion paslaugai skirtą, raktą onionServices.authPrompt.done=Atlikta onionServices.authPrompt.doneAccessKey=u onionServices.authPrompt.invalidKey=Įveskite galiojantį raktą (52 base32 arba 44 base64 simbolius) diff --git a/chrome/locale/mk/torbutton.dtd b/chrome/locale/mk/torbutton.dtd index 992293dc..b9fb0be0 100644 --- a/chrome/locale/mk/torbutton.dtd +++ b/chrome/locale/mk/torbutton.dtd @@ -49,4 +49,4 @@ <!ENTITY torbutton.circuit_display.new_circuit "Нов круг за оваа веб страна">  -<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.tooltip "Отвори конзола за автентикација на onion клиентска услуга"> diff --git a/chrome/locale/mk/torbutton.properties b/chrome/locale/mk/torbutton.properties index 7e93a49c..d7f28a23 100644 --- a/chrome/locale/mk/torbutton.properties +++ b/chrome/locale/mk/torbutton.properties @@ -61,10 +61,10 @@ pageInfo_OnionEncryption=Енкриптирано поврзување (Onion У # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.clientAuthMissing=Tor onion service missing client authorization -onionServices.authPrompt.description=%S is requesting your private key. -onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service +onionServices.clientAuthMissing=На Tor onion услугата и недостасува клиентска автентикација +onionServices.authPrompt.description=%S го бара вашиот приватен клуч. +onionServices.authPrompt.keyPlaceholder=Внесете го вашиот приватен клуч за оваа onion услуга onionServices.authPrompt.done=Завршено onionServices.authPrompt.doneAccessKey=d -onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) -onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPrompt.invalidKey=Ве молиме внесете валиден клуч (52 база32карактери или 44 база64 карактери) +onionServices.authPrompt.failedToSetKey=Не може да се кофигурира Tor со вашиот клуч diff --git a/chrome/locale/nl/aboutTor.dtd b/chrome/locale/nl/aboutTor.dtd index 56de9c0c..884fdb68 100644 --- a/chrome/locale/nl/aboutTor.dtd +++ b/chrome/locale/nl/aboutTor.dtd @@ -22,7 +22,7 @@ <!ENTITY aboutTor.torbrowser_user_manual.accesskey "H"> <!ENTITY aboutTor.torbrowser_user_manual.label "Tor-browserhandleiding"> -<!ENTITY aboutTor.tor_mission.label "Het Tor-project is een 501(c)(3)-non-profitorganisatie in de VS die rechten en vrijheden van de mens bevordert door het ontwikkelen en implementeren van vrije anonimiteits- en privacytechnologieën, de onbeperkte beschikbaarheid en het gebruik ervan te steunen, en het begrip ervan in de wetenschap en bij het algemeen publiek te bevorderen."> +<!ENTITY aboutTor.tor_mission.label "Het Tor Project is een 501(c)(3)-non-profitorganisatie in de VS die rechten en vrijheden van de mens bevordert door vrije en open source anonimiteits- en privacytechnologieën te ontwikkelen en te implementeren, de onbeperkte beschikbaarheid en het gebruik ervan te steunen, en het begrip ervan in de wetenschap en bij het algemeen publiek te bevorderen."> <!ENTITY aboutTor.getInvolved.label "Doe mee »"> <!ENTITY aboutTor.newsletter.tagline "Ontvang het laatste nieuws van Tor direct in uw postvak."> diff --git a/chrome/locale/ro/browserOnboarding.properties b/chrome/locale/ro/browserOnboarding.properties index 27989597..09e58f89 100644 --- a/chrome/locale/ro/browserOnboarding.properties +++ b/chrome/locale/ro/browserOnboarding.properties @@ -15,8 +15,8 @@ onboarding.tour-tor-privacy.button=Sari la Rețeaua Tor onboarding.tour-tor-network=Rețea Tor onboarding.tour-tor-network.title=Navighează într-o rețea descentralizată onboarding.tour-tor-network.description=Navigatorul Tor Browser te conectează la rețeaua Tor, menținută de mii de voluntari din întreaga lume. Spre deosebire de o rețea VPN, nu există un punct ce poate eșua sau o entitate centralizată căreia trebuie să ii acorzi încrederea pentru a te bucura de Internet în mod total privat. -onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. -onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings +onboarding.tour-tor-network.description-para2=NOU: Setările rețelei Tor, inclusiv posibilitatea de a solicita poduri unde este blocat Tor, pot fi găsite acum în Preferințe. +onboarding.tour-tor-network.action-button=Ajustați Setările rețelei Tor onboarding.tour-tor-network.button=Sari la Afișaj Circuit onboarding.tour-tor-circuit-display=Afișaj Circuit @@ -49,10 +49,10 @@ onboarding.tour-tor-update.prefix-new=Nou onboarding.tour-tor-update.prefix-updated=Actualizat onboarding.tour-tor-toolbar=Bara cu instrumente -onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button. -onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser. -onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu. -onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity +onboarding.tour-tor-toolbar-update-9.0.title=La revedere buton onion. +onboarding.tour-tor-toolbar-update-9.0.description=Dorim ca experiența dvs. folosind Tor să fie complet integrată în Tor Browser. +onboarding.tour-tor-toolbar-update-9.0.description-para2=De aceea acum, în loc să folosiți butonul ceapă, puteți vedea Circuitul Tor dvs. prin [i] în bara URL și puteți solicita o nouă identitate folosind butonul barei de instrumente sau meniul [≡]. +onboarding.tour-tor-toolbar-update-9.0.button=Cum să solicitați o nouă identitate onboarding.tour-tor-toolbar-update-9.0.next-button=Sari la Rețeaua Tor # Circuit Display onboarding. diff --git a/chrome/locale/ro/torbutton.dtd b/chrome/locale/ro/torbutton.dtd index e29fc245..9bbb81bb 100644 --- a/chrome/locale/ro/torbutton.dtd +++ b/chrome/locale/ro/torbutton.dtd @@ -50,4 +50,4 @@ <!ENTITY torbutton.circuit_display.new_circuit "Circuit nou pentru acest site">  -<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.tooltip "Deschideți promptul de autentificare a clientului de serviciu onion"> diff --git a/chrome/locale/ro/torbutton.properties b/chrome/locale/ro/torbutton.properties index 259825e2..77da0e24 100644 --- a/chrome/locale/ro/torbutton.properties +++ b/chrome/locale/ro/torbutton.properties @@ -61,10 +61,10 @@ pageInfo_OnionEncryption=Conexiune Criptată (Serviciu Onion) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.clientAuthMissing=Tor onion service missing client authorization -onionServices.authPrompt.description=%S is requesting your private key. -onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service +onionServices.clientAuthMissing=Serviciul onion Tor nu are autorizația clientului +onionServices.authPrompt.description=%S solicită cheia dvs. privată. +onionServices.authPrompt.keyPlaceholder=Introduceți cheia privată pentru acest serviciu de ceapă onionServices.authPrompt.done=Gata onionServices.authPrompt.doneAccessKey=d -onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) -onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPrompt.invalidKey=Vă rugăm să introduceți o cheie validă (52 de caractere base32 sau 44 de caractere base64) +onionServices.authPrompt.failedToSetKey=Imposibil de configurat Tor cu cheia dvs. diff --git a/chrome/locale/ru/torbutton.properties b/chrome/locale/ru/torbutton.properties index 1b4716b2..06ab9597 100644 --- a/chrome/locale/ru/torbutton.properties +++ b/chrome/locale/ru/torbutton.properties @@ -62,9 +62,9 @@ pageInfo_OnionEncryption=Соединение зашифровано (Onion Serv # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.clientAuthMissing=Tor onion service missing client authorization -onionServices.authPrompt.description=%S is requesting your private key. +onionServices.authPrompt.description=%S запрашивает ваш закрытый ключ. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service onionServices.authPrompt.done=Готово onionServices.authPrompt.doneAccessKey=Д onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) -onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPrompt.failedToSetKey=Не удается настроить Tor с вашим ключом diff --git a/chrome/locale/sv-SE/aboutDialog.dtd b/chrome/locale/sv-SE/aboutDialog.dtd index 5b080138..c556fcf2 100644 --- a/chrome/locale/sv-SE/aboutDialog.dtd +++ b/chrome/locale/sv-SE/aboutDialog.dtd @@ -13,7 +13,7 @@  <!ENTITY bottomLinks.questions "Frågor?">  -<!ENTITY bottomLinks.grow "Hjälp Tor-nätverket växa!!"> +<!ENTITY bottomLinks.grow "Hjälp Tor-nätverket växa!">  <!ENTITY bottomLinks.license "Licens information"> <!ENTITY tor.TrademarkStatement "'Tor' och 'Onion-logotypen' är registerade varumärken av Tor Project, Inc."> diff --git a/chrome/locale/zh-CN/torbutton.dtd b/chrome/locale/zh-CN/torbutton.dtd index 45709b20..ad349c64 100644 --- a/chrome/locale/zh-CN/torbutton.dtd +++ b/chrome/locale/zh-CN/torbutton.dtd @@ -49,4 +49,4 @@ <!ENTITY torbutton.circuit_display.new_circuit "为此站点使用新线路">  -<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.tooltip "打开洋葱服务客户端认证提示"> diff --git a/chrome/locale/zh-CN/torbutton.properties b/chrome/locale/zh-CN/torbutton.properties index b70c7836..ca456387 100644 --- a/chrome/locale/zh-CN/torbutton.properties +++ b/chrome/locale/zh-CN/torbutton.properties @@ -61,10 +61,10 @@ pageInfo_OnionEncryption=连接已经被加密（洋葱服务） # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.clientAuthMissing=Tor onion service missing client authorization -onionServices.authPrompt.description=%S is requesting your private key. -onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service +onionServices.clientAuthMissing=Tor 洋葱服务客户端认证失败 +onionServices.authPrompt.description=%S 需要您的私钥 +onionServices.authPrompt.keyPlaceholder=键入您的私人密钥来使用此洋葱服务 onionServices.authPrompt.done=完成 onionServices.authPrompt.doneAccessKey=天 -onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) -onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPrompt.invalidKey=请键入一个合法的密钥（52位base32字符或44位base64字符） +onionServices.authPrompt.failedToSetKey=无法使用您的密钥来配置Tor diff --git a/chrome/locale/zh-TW/torbutton.properties b/chrome/locale/zh-TW/torbutton.properties index 0d44fdb6..dbef4780 100644 --- a/chrome/locale/zh-TW/torbutton.properties +++ b/chrome/locale/zh-TW/torbutton.properties @@ -61,10 +61,10 @@ pageInfo_OnionEncryption=連接加密（洋蔥服務） # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.clientAuthMissing=Tor onion service missing client authorization -onionServices.authPrompt.description=%S is requesting your private key. -onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service +onionServices.clientAuthMissing=Tor onion 服務缺少用戶端授權 +onionServices.authPrompt.description=%S 正請求您的私鑰。 +onionServices.authPrompt.keyPlaceholder=請輸入私鑰以使用此 onion 服務 onionServices.authPrompt.done=完成 onionServices.authPrompt.doneAccessKey=d -onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) -onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPrompt.invalidKey=請輸入有效金鑰（52 個 Base32 字元，或 44 個 Base64 字元） +onionServices.authPrompt.failedToSetKey=無法使用您的金鑰設定 Tor

1 0

[tor-browser-build/maint-9.0] We use build3 for 9.0.3
by gk＠torproject.org 04 Jan '20

04 Jan '20

commit f214c548bcea8aa0107289dceba4b473164d0fab Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jan 4 20:19:11 2020 +0000 We use build3 for 9.0.3 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 6139b9f..134401f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0.3' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 9.0.2 project_name: tor-browser

1 0

[tor-browser-build/maint-9.0] It's 2020 and the new tor stable is for desktop only
by gk＠torproject.org 04 Jan '20

04 Jan '20

commit 38058750317e3bc627e2092921134bc25d4c31f4 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jan 4 20:17:22 2020 +0000 It's 2020 and the new tor stable is for desktop only --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 54ec4b7..3e338f3 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,8 +1,7 @@ -Tor Browser 9.0.3 -- January 7 2019 +Tor Browser 9.0.3 -- January 7 2020 * All Platforms * Update Firefox to 68.4.0esr * Bump NoScript to 11.0.11 - * Bump Tor to 0.4.2.5 * Translations update * Update OpenPGP keyring * Bug 32606: Set up default bridge at Georgetown University @@ -10,6 +9,7 @@ Tor Browser 9.0.3 -- January 7 2019 * Bug 32547: Add new default bridge at UMN * Bug 31855: Remove End of Year Fundraising Campaign from about:tor * Windows + OS X + Linux + * Bump Tor to 0.4.2.5 * Update Tor Launcher to 0.2.20.5 * Bug 32636: Clean up locales shipped with Tor Launcher * Android

1 0