date:20210111

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

2021-01-11 Thread translation

commit 19d01b2e6627e5bdd9764f776a071d5701e8a33c
Author: Translation commit bot 
Date:   Tue Jan 12 06:46:48 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 tr.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tr.po b/tr.po
index 83bf8d24c9..4a7483ee09 100644
--- a/tr.po
+++ b/tr.po
@@ -23,7 +23,7 @@
 # Tails_developers , 2014
 # Tails_developers , 2014
 # T. E. Kalayci , 2017-2018
-# T. E. Kalayci , 2020
+# T. E. Kalayci , 2020-2021
 # Th3Kh3d1v3, 2018
 # Ãmit TÃ¼rk , 2013
 # Volkan Gezer , 2013-2016
@@ -33,8 +33,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-05 11:44+0100\n"
-"PO-Revision-Date: 2021-01-05 12:15+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-01-12 06:21+\n"
+"Last-Translator: T. E. Kalayci \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

2021-01-11 Thread translation

commit 9601c153e742f5d9e7b182d5d1f1f33375bace6c
Author: Translation commit bot 
Date:   Tue Jan 12 06:45:55 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 tr.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tr.po b/tr.po
index af7e75a58e..6a33042aa8 100644
--- a/tr.po
+++ b/tr.po
@@ -23,7 +23,7 @@
 # Tails_developers , 2014
 # Tails_developers , 2014
 # T. E. Kalayci , 2017-2018
-# T. E. Kalayci , 2020
+# T. E. Kalayci , 2020-2021
 # Th3Kh3d1v3, 2018
 # Ãmit TÃ¼rk , 2013
 # Volkan Gezer , 2013-2016
@@ -33,8 +33,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-05 11:44+0100\n"
-"PO-Revision-Date: 2021-01-05 12:15+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-01-12 06:21+\n"
+"Last-Translator: T. E. Kalayci \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -310,7 +310,7 @@ msgid ""
 "The network connection will be disabled when applying the upgrade.\n"
 "\n"
 "Please save your work and close all other applications."
-msgstr ""
+msgstr "GÃ¼ncelleme baÅarÄ±lÄ± bir Åekilde indirildi.\n\nGÃ¼ncelleme 
yapÄ±lÄ±rken aÄ baÄlantÄ±nÄ±z devre dÄ±ÅÄ± bÄ±rakÄ±lacak.\n\nLÃ¼tfen 
Ã§alÄ±ÅmalarÄ±nÄ±zÄ± kaydedip aÃ§Ä±k olan tÃ¼m diÄer uygulamalarÄ± kapatÄ±n."
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:700
 msgid "Upgrade successfully downloaded"
@@ -375,7 +375,7 @@ msgid ""
 "Your Tails device is being upgraded...\n"
 "\n"
 "For security reasons, the network connection is now disabled."
-msgstr ""
+msgstr "Tails aygÄ±tÄ±nÄ±z gÃ¼ncelleniyor...\n\nGÃ¼venlik nedenleriyle, 
aÄ baÄlantÄ±sÄ± devre dÄ±ÅÄ± bÄ±rakÄ±ldÄ±."
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:796
 msgid ""
@@ -1621,7 +1621,7 @@ msgstr "Sunucu iÅletim sistemi ve sanallaÅtÄ±rma 
uygulamasÄ± Tails Ã¼zerinde y
 
 #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:40
 msgid "Don't Show Again"
-msgstr ""
+msgstr "Tekrar GÃ¶sterme"
 
 #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:42
 msgid "Learn More"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/mat-gui_completed] https://gitweb.torproject.org/translation.git/commit/?h=mat-gui_completed

2021-01-11 Thread translation

commit 873a1138373bb40ce79dad2ccc69c8ded69709cc
Author: Translation commit bot 
Date:   Tue Jan 12 04:45:37 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=mat-gui_completed
---
 tr.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tr.po b/tr.po
index 0236c36844..b5028ad7a7 100644
--- a/tr.po
+++ b/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-10 23:06+0100\n"
 "PO-Revision-Date: 2019-01-15 12:23+\n"
-"Last-Translator: falcontr06\n"
+"Last-Translator: á á á á  á á á á  á á á á \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [stem/master] Fix test_version_argument to work with recent Tors.

2021-01-11 Thread atagar

commit 625a902533b9c3429b09fc2f01800b35dfc4179c
Author: Nick Mathewson 
Date:   Tue Dec 8 08:15:36 2020 -0500

Fix test_version_argument to work with recent Tors.

Tor now reports versions of libraries and the compilers use to build
it.  Only the first line has the Tor version.
---
 test/integ/process.py | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/integ/process.py b/test/integ/process.py
index 6abd9e6a..c2388146 100644
--- a/test/integ/process.py
+++ b/test/integ/process.py
@@ -107,7 +107,11 @@ class TestProcess(unittest.TestCase):
 Check that 'tor --version' matches 'GETINFO version'.
 """
 
-assert_equal('Tor version %s.\n' % test.tor_version(), run_tor(tor_cmd, 
'--version'))
+# We're only interested in the first line of output:
+# Other lines are about libraries and compilers.
+tor_version = run_tor(tor_cmd,  '--version').split("\n")[0]
+
+assert_equal('Tor version %s.' % test.tor_version(), tor_version)
 
   @asynchronous
   def test_help_argument(tor_cmd):

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

2021-01-11 Thread translation

commit da0d97509c071549d99e9dcca4f1da67b6212380
Author: Translation commit bot 
Date:   Mon Jan 11 22:46:43 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 fr.po | 30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/fr.po b/fr.po
index f950ed9308..59bff5086c 100644
--- a/fr.po
+++ b/fr.po
@@ -41,7 +41,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-05 11:44+0100\n"
-"PO-Revision-Date: 2021-01-11 22:14+\n"
+"PO-Revision-Date: 2021-01-11 22:31+\n"
 "Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -318,7 +318,7 @@ msgid ""
 "The network connection will be disabled when applying the upgrade.\n"
 "\n"
 "Please save your work and close all other applications."
-msgstr ""
+msgstr "La mise Ã  niveau a Ã©tÃ© tÃ©lÃ©chargÃ©e avec succÃ¨s.\n\nLa connexion 
rÃ©seau sera dÃ©sactivÃ©e pendant lâapplication de la mise Ã  
niveau.\n\nVeuillez enregistrer vos travaux et fermer toutes autres 
applications."
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:700
 msgid "Upgrade successfully downloaded"
@@ -336,7 +336,7 @@ msgid ""
 "You should restart Tails on the new version as soon as possible.\n"
 "\n"
 "Do you want to restart now?"
-msgstr "Votre pÃ©riphÃ©rique Tails a Ã©tÃ© mis Ã  niveau avec 
succÃ¨s.\n\nQuelques fonctionnalitÃ©s de sÃ©curitÃ© ont Ã©tÃ© 
temporairement dÃ©sactivÃ©es..\nVous devriez redÃ©marrer Tails sur la nouvelle 
version dÃ¨s que possible.\n\nVoulez-vous redÃ©marrer maintenantââ?"
+msgstr "Votre pÃ©riphÃ©riqueÂ Tails a Ã©tÃ© mis Ã  niveau avec 
succÃ¨s.\n\nQuelques fonctionnalitÃ©s de sÃ©curitÃ© ont Ã©tÃ© 
temporairement dÃ©sactivÃ©es..\nVous devriez redÃ©marrer Tails sur la nouvelle 
version dÃ¨s que possible.\n\nVoulez-vous redÃ©marrer maintenantââ?"
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:713
 msgid "Restart Tails"
@@ -383,7 +383,7 @@ msgid ""
 "Your Tails device is being upgraded...\n"
 "\n"
 "For security reasons, the network connection is now disabled."
-msgstr ""
+msgstr "Votre pÃ©riphÃ©riqueÂ Tails est en cours de mise Ã  
niveauâ¦\n\nPour des raisons de sÃ©curitÃ©, la connexion au rÃ©seau est 
actuellement dÃ©sactivÃ©e."
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:796
 msgid ""
@@ -391,7 +391,7 @@ msgid ""
 " needs to be repaired and might be unable to restart.\\n\\nPlease follow the"
 " instructions at "
 "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html"
-msgstr "Une erreur est survenue durant lâinstallation de la mise Ã  
niveau.\\n\\nVotre pÃ©riphÃ©rique Tails doit Ãªtre rÃ©parÃ© et pourrait ne 
pas redÃ©marrer.\\n\\nVeuillez suivre les instructions sur 
file:///usr/share/doc/tails/website/doc/upgrade/error/install.fr.html"
+msgstr "Une erreur est survenue durant lâinstallation de la mise Ã  
niveau.\\n\\nVotre pÃ©riphÃ©riqueÂ Tails doit Ãªtre rÃ©parÃ© et pourrait ne 
pas redÃ©marrer.\\n\\nVeuillez suivre les instructions sur 
file:///usr/share/doc/tails/website/doc/upgrade/error/install.fr.html"
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:806
 msgid "Error while installing the upgrade"
@@ -624,17 +624,17 @@ msgstr "Aucun point de montage nâa Ã©tÃ© trouvÃ©"
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:661
 #, python-format
 msgid "Entering unmount_device for \"%(device)s\""
-msgstr ""
+msgstr "Saisie de unmount_device pour Â«Â %(device)sÂ Â»"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:670
 #, python-format
 msgid "Unmounting mounted filesystems on \"%(device)s\""
-msgstr ""
+msgstr "DÃ©montage des systÃ¨mes de fichiers montÃ©s sur Â«Â %(device)sÂ Â»"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:674
 #, python-format
 msgid "Unmounting \"%(udi)s\" on \"%(device)s\""
-msgstr ""
+msgstr "DÃ©montage de Â«Â %(udi)sÂ Â» sur Â«Â %(device)sÂ Â»"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:685
 #, python-format
@@ -804,7 +804,7 @@ msgstr "Le pÃ©riphÃ©rique Â«Â %(pretty_name)sÂ Â» est trop 
petit pour installer
 msgid ""
 "To upgrade device \"%(pretty_name)s\" from this Tails, you need to use a 
downloaded Tails ISO image:\n"
 "%(dl_url)s"
-msgstr ""
+msgstr "Pour mettre Ã  niveau le pÃ©riphÃ©rique Â«Â %(pretty_name)sÂ Â» Ã  
partir de ce Tails, vous devez utiliser une imageÂ ISOÂ Tails tÃ©lÃ©chargÃ©eÂ 
:\n%(dl_url)s"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:513
 msgid "An error happened while installing Tails"
@@ -885,17 +885,17 @@ msgstr "Un problÃ¨me est survenu lors de lâexÃ©cution 
de `%(cmd)s`.\n%(out)s\n
 #:

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

2021-01-11 Thread translation

commit ef9520b1921c76b12afea9940d18d9f3f951dd97
Author: Translation commit bot 
Date:   Mon Jan 11 22:45:52 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 fr.po | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/fr.po b/fr.po
index b97edc91f9..59bff5086c 100644
--- a/fr.po
+++ b/fr.po
@@ -41,7 +41,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-05 11:44+0100\n"
-"PO-Revision-Date: 2021-01-11 22:14+\n"
+"PO-Revision-Date: 2021-01-11 22:31+\n"
 "Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -318,7 +318,7 @@ msgid ""
 "The network connection will be disabled when applying the upgrade.\n"
 "\n"
 "Please save your work and close all other applications."
-msgstr ""
+msgstr "La mise Ã  niveau a Ã©tÃ© tÃ©lÃ©chargÃ©e avec succÃ¨s.\n\nLa connexion 
rÃ©seau sera dÃ©sactivÃ©e pendant lâapplication de la mise Ã  
niveau.\n\nVeuillez enregistrer vos travaux et fermer toutes autres 
applications."
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:700
 msgid "Upgrade successfully downloaded"
@@ -336,7 +336,7 @@ msgid ""
 "You should restart Tails on the new version as soon as possible.\n"
 "\n"
 "Do you want to restart now?"
-msgstr "Votre pÃ©riphÃ©rique Tails a Ã©tÃ© mis Ã  niveau avec 
succÃ¨s.\n\nQuelques fonctionnalitÃ©s de sÃ©curitÃ© ont Ã©tÃ© 
temporairement dÃ©sactivÃ©es..\nVous devriez redÃ©marrer Tails sur la nouvelle 
version dÃ¨s que possible.\n\nVoulez-vous redÃ©marrer maintenantââ?"
+msgstr "Votre pÃ©riphÃ©riqueÂ Tails a Ã©tÃ© mis Ã  niveau avec 
succÃ¨s.\n\nQuelques fonctionnalitÃ©s de sÃ©curitÃ© ont Ã©tÃ© 
temporairement dÃ©sactivÃ©es..\nVous devriez redÃ©marrer Tails sur la nouvelle 
version dÃ¨s que possible.\n\nVoulez-vous redÃ©marrer maintenantââ?"
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:713
 msgid "Restart Tails"
@@ -383,7 +383,7 @@ msgid ""
 "Your Tails device is being upgraded...\n"
 "\n"
 "For security reasons, the network connection is now disabled."
-msgstr ""
+msgstr "Votre pÃ©riphÃ©riqueÂ Tails est en cours de mise Ã  
niveauâ¦\n\nPour des raisons de sÃ©curitÃ©, la connexion au rÃ©seau est 
actuellement dÃ©sactivÃ©e."
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:796
 msgid ""
@@ -391,7 +391,7 @@ msgid ""
 " needs to be repaired and might be unable to restart.\\n\\nPlease follow the"
 " instructions at "
 "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html"
-msgstr "Une erreur est survenue durant lâinstallation de la mise Ã  
niveau.\\n\\nVotre pÃ©riphÃ©rique Tails doit Ãªtre rÃ©parÃ© et pourrait ne 
pas redÃ©marrer.\\n\\nVeuillez suivre les instructions sur 
file:///usr/share/doc/tails/website/doc/upgrade/error/install.fr.html"
+msgstr "Une erreur est survenue durant lâinstallation de la mise Ã  
niveau.\\n\\nVotre pÃ©riphÃ©riqueÂ Tails doit Ãªtre rÃ©parÃ© et pourrait ne 
pas redÃ©marrer.\\n\\nVeuillez suivre les instructions sur 
file:///usr/share/doc/tails/website/doc/upgrade/error/install.fr.html"
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:806
 msgid "Error while installing the upgrade"
@@ -624,17 +624,17 @@ msgstr "Aucun point de montage nâa Ã©tÃ© trouvÃ©"
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:661
 #, python-format
 msgid "Entering unmount_device for \"%(device)s\""
-msgstr "Sasie de unmount_device pour \"%(device)s\""
+msgstr "Saisie de unmount_device pour Â«Â %(device)sÂ Â»"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:670
 #, python-format
 msgid "Unmounting mounted filesystems on \"%(device)s\""
-msgstr "DÃ©montage des systÃ¨mes de fichiers montÃ©s sur \"%(device)s\""
+msgstr "DÃ©montage des systÃ¨mes de fichiers montÃ©s sur Â«Â %(device)sÂ Â»"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:674
 #, python-format
 msgid "Unmounting \"%(udi)s\" on \"%(device)s\""
-msgstr "DÃ©montage de \"%(udi)s\" sur\"%(device)s\""
+msgstr "DÃ©montage de Â«Â %(udi)sÂ Â» sur Â«Â %(device)sÂ Â»"
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:685
 #, python-format
@@ -804,7 +804,7 @@ msgstr "Le pÃ©riphÃ©rique Â«Â %(pretty_name)sÂ Â» est trop 
petit pour installer
 msgid ""
 "To upgrade device \"%(pretty_name)s\" from this Tails, you need to use a 
downloaded Tails ISO image:\n"
 "%(dl_url)s"
-msgstr "Pour mettre Ã  niveau lâappareil \"%(pretty_name)s\" Ã  partir de ce 
Tails, vous devez utiliser une image ISO Tails tÃ©lÃ©chargÃ©e :\n%(dl_url)s"
+msgstr "Pour mettre Ã  niveau le pÃ©riphÃ©rique Â«Â %(pretty_name)sÂ Â» Ã  
partir de ce Tails, vous devez utiliser une imageÂ ISOÂ Tails tÃ©lÃ©chargÃ©eÂ 
:\n%(dl_url)s"
 
 #:

[tor-commits] [translation/tails-misc_completed] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_completed

2021-01-11 Thread translation

commit 314e4ad5990c61d84a4efde84b01253cfb90b411
Author: Translation commit bot 
Date:   Mon Jan 11 22:45:54 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_completed
---
 fr.po | 2404 +
 1 file changed, 2404 insertions(+)

diff --git a/fr.po b/fr.po
new file mode 100644
index 00..59bff5086c
--- /dev/null
+++ b/fr.po
@@ -0,0 +1,2404 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# bassmax, 2014-2015
+# Alex , 2014
+# tneskovic , 2014
+# AO , 2015,2018-2021
+# apaddlingduck, 2014
+# apaddlingduck, 2014
+# Athorcis, 2015
+# Athorcis, 2015
+# Curtis Baltimore , 2019-2020
+# Domiho Zannou , 2018
+# Emmanuel Simond , 2014
+# Emmanuel Simond , 2014
+# Emma Peel, 2018
+# Emma Peel, 2018
+# AO , 2017-2018
+# French language coordinator , 2015-2017
+# Gwennole Hangard , 2015
+# Jean-Yves Toumit , 2013
+# Lidija , 2015
+# mosira , 2014
+# Onizuka, 2013
+# Onizuka, 2013
+# PoorPockets McNewHold , 2020
+# mosira , 2014
+# Sabrina Cater , 2015
+# Simon-Olivier Morneau , 2018-2019
+# Thomas Chauchefoin , 2016
+# Thomas PrÃ©vost , 2018
+# tneskovic , 2014
+# Towinet, 2013-2016
+# AO , 2015
+# xin, 2019
+# xin, 2019-2020
+msgid ""
+msgstr ""
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-01-05 11:44+0100\n"
+"PO-Revision-Date: 2021-01-11 22:31+\n"
+"Last-Translator: AO \n"
+"Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:42
+msgid "Tor is ready"
+msgstr "Tor est prÃªt"
+
+#: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43
+msgid "You can now access the Internet."
+msgstr "Vous pouvez maintenant accÃ©der Ã  Internet."
+
+#: config/chroot_local-includes/etc/whisperback/config.py:69
+#, python-format
+msgid ""
+"Help us fix your bug!\n"
+"Read our bug reporting instructions.\n"
+"Do not include more personal information than\n"
+"needed!\n"
+"About giving us an email address\n"
+"\n"
+"Giving us an email address allows us to contact you to clarify the problem. 
This\n"
+"is needed for the vast majority of the reports we receive as most reports\n"
+"without any contact information are useless. On the other hand it also 
provides\n"
+"an opportunity for eavesdroppers, like your email or Internet provider, to\n"
+"confirm that you are using Tails.\n"
+"\n"
+msgstr "Aidez-nous Ã  corriger votre bogueâ!\nLisez nos instructions de rapport de 
bogue.\nNâincluez pas plus de renseignements personnels 
que nÃ©cessaireâ!\nNous donner une adresse 
courriel\n\nEn nous donnant une adresse courriel, vous nous permettez 
de vous contacter pour clarifier le problÃ¨me. Cela est nÃ©cessaire pour la 
vaste majoritÃ© des rapports que nous recevons, car la plupart des rapports 
sans coordonnÃ©es de contact sont inutiles. Dâun autre cÃ´tÃ©, cela donne une 
occasion aux oreilles Ã©lectroniques indiscrÃ¨tes, comme votre fournisseur de 
service Internet ou de courriel, de confirmer que vous utilisez Tails.\n\n"
+
+#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
+#: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:113
+#: 
../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
+msgid "Additional Software"
+msgstr "Logiciels supplÃ©mentaires"
+
+#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:51
+msgid ""
+"You can install additional software automatically from your persistent "
+"storage when starting Tails."
+msgstr "Vous pouvez installer des logiciels supplÃ©mentaires automatiquement Ã 
 partir de votre stockage persistant lors du dÃ©marrage de Tails."
+
+#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:77
+msgid ""
+"The following software is installed automatically from your persistent "
+"storage when starting Tails."
+msgstr "Les logiciels suivants sont installÃ©s automatiquement Ã  partir de 
votre stockage persistant lors du dÃ©marrage de Tails."
+
+#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:135
+#: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:171
+msgid ""
+"To add more, install some software using Synaptic Package Manager or APT on the command line."
+msgstr "Pour en ajouter dâautres, installez des logiciels en utilisant le gestionnaire de paquets Synaptic ou APT en ligne de commande."
+
+#:

[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

2021-01-11 Thread translation

commit 7a25cab45b088d432591aca7877bd2fabe11
Author: Translation commit bot 
Date:   Mon Jan 11 22:16:56 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+el.po | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/contents+el.po b/contents+el.po
index 0ad127d920..cc172e54f1 100644
--- a/contents+el.po
+++ b/contents+el.po
@@ -2882,11 +2882,14 @@ msgid ""
 "Browser for Android does not prevent your subsequent browser activity from "
 "being linkable to what you were doing before."
 msgstr ""
+"ÎÎ½ÏÎ¯Î¸ÎµÏÎ± Î¼Îµ ÏÎ¿Î½ Tor Browser Î³Î¹Î± ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎÏ, ÏÎ¿ 
ÎºÎ¿ÏÎ¼ÏÎ¯ Â«ÎÎÎ Î¤ÎÎ¥Î¤ÎÎ¤ÎÎ¤ÎÂ» ÏÎ¿Ï "
+"Tor Browser Î³Î¹Î± Android Î´ÎµÎ½ ÎµÎ¼ÏÎ¿Î´Î¯Î¶ÎµÎ¹ ÏÎ·Î½ 
Î´ÏÎ±ÏÏÎ·ÏÎ¹ÏÏÎ·ÏÎ± ÏÎ¿Ï ÏÎµÏÎ¹Î·Î³Î·ÏÎ® Î½Î± "
+"ÏÏÎ½Î´ÎµÎ¸ÎµÎ¯ Î¼Îµ Ï,ÏÎ¹ ÎÎºÎ±Î½Îµ ÏÏÎ¹Î½."
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
 msgid "Selecting it will only change your Tor circuit."
-msgstr ""
+msgstr "ÎÏÎ¹Î»ÎÎ³Î¿Î½ÏÎ¬Ï ÏÎ·Î½ Î±ÏÎ»ÏÏ Î¸Î± Î±Î»Î»Î¬Î¾ÎµÎ¹ ÏÎ¿ 
ÎºÏÎºÎ»ÏÎ¼Î± Tor."
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

2021-01-11 Thread translation

commit 1af19bcefca4d95243f916d08116f55b4c35a3fc
Author: Translation commit bot 
Date:   Mon Jan 11 22:16:36 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 fr.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fr.po b/fr.po
index 56725b549e..f950ed9308 100644
--- a/fr.po
+++ b/fr.po
@@ -6,7 +6,7 @@
 # bassmax, 2014-2015
 # Alex , 2014
 # tneskovic , 2014
-# AO , 2015,2018-2020
+# AO , 2015,2018-2021
 # apaddlingduck, 2014
 # apaddlingduck, 2014
 # Athorcis, 2015
@@ -41,8 +41,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-05 11:44+0100\n"
-"PO-Revision-Date: 2021-01-05 12:15+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-01-11 22:14+\n"
+"Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -257,7 +257,7 @@ msgid ""
 "It is not possible to automatically upgrade your device to this new version: 
{explanation}.\n"
 "\n"
 "To learn how to do a manual upgrade, go to {manual_upgrade_url}"
-msgstr ""
+msgstr "Vous devriez mettre Ã  niveau manuellement vers {name}Â 
{version}.\n\nPour plus de prÃ©cisions sur cette nouvelle version, visitez 
{details_url}.\n\nIl nâest pas possible de mettre votre appareil 
automatiquement Ã  niveau vers cette nouvelle versionÂ : {explanation}.\n\nPour 
apprendre Ã  faire une mise Ã  niveau manuelle, visitez {manual_upgrade_url}"
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:471
 msgid "New version available"
@@ -553,7 +553,7 @@ msgstr "Ãcriture sur le pÃ©riphÃ©rique effectuÃ©e Ã  
%(speed)dÂ Mo/sec"
 msgid ""
 "There was a problem executing the following command: `%(command)s`.\n"
 "A more detailed error log has been written to \"%(filename)s\"."
-msgstr ""
+msgstr "Un problÃ¨me est survenu lors de lâexÃ©cution de la commande 
suivanteÂ : `%(command)s`.\nUn journal dâerreurs plus dÃ©taillÃ© a Ã©tÃ© 
Ã©crit dans le fichier `%(filename)s`."
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:424
 #, python-format

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

2021-01-11 Thread translation

commit 793ea24d3637d59ee006ccc50f676a215b1cd125
Author: Translation commit bot 
Date:   Mon Jan 11 22:15:51 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 fr.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fr.po b/fr.po
index a433c411cf..b97edc91f9 100644
--- a/fr.po
+++ b/fr.po
@@ -6,7 +6,7 @@
 # bassmax, 2014-2015
 # Alex , 2014
 # tneskovic , 2014
-# AO , 2015,2018-2020
+# AO , 2015,2018-2021
 # apaddlingduck, 2014
 # apaddlingduck, 2014
 # Athorcis, 2015
@@ -41,8 +41,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-05 11:44+0100\n"
-"PO-Revision-Date: 2021-01-05 12:15+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-01-11 22:14+\n"
+"Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -553,7 +553,7 @@ msgstr "Ãcriture sur le pÃ©riphÃ©rique effectuÃ©e Ã  
%(speed)dÂ Mo/sec"
 msgid ""
 "There was a problem executing the following command: `%(command)s`.\n"
 "A more detailed error log has been written to \"%(filename)s\"."
-msgstr "Un problÃ¨me est survenu lors de lâexÃ©cution de la commande 
suivante: `%(command)s`.\nUn journal dâerreurs plus dÃ©taillÃ© a Ã©tÃ© Ã©crit 
dans le fichier \"%(filename)s\"."
+msgstr "Un problÃ¨me est survenu lors de lâexÃ©cution de la commande 
suivanteÂ : `%(command)s`.\nUn journal dâerreurs plus dÃ©taillÃ© a Ã©tÃ© 
Ã©crit dans le fichier `%(filename)s`."
 
 #: 
config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:424
 #, python-format

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-84.0-10.5-2] fixup! Bug 32658: Create a new MAR signing key

2021-01-11 Thread sysrqb

commit 84dc3a4f15136c36ba3d79689b530e0ab55830e1
Author: Georg Koppen 
Date:   Fri Jan 8 07:57:34 2021 +

fixup! Bug 32658: Create a new MAR signing key

Closes #40274.
---
 .../update/updater/nightly_aurora_level3_primary.der  | Bin 1245 -> 1245 bytes
 .../updater/nightly_aurora_level3_secondary.der   | Bin 1245 -> 1245 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der 
b/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der
index a3a3077cc574..d579cf801e1a 100644
Binary files a/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der 
and b/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der differ
diff --git a/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der 
b/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der
index d579cf801e1a..7cbfa77d06e7 100644
Binary files 
a/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der and 
b/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der differ

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.6.0esr-10.5-1] Merge remote-tracking branch 'gkgl/bug_40274' into tor-browser-78.6.0esr-10.5-1

2021-01-11 Thread sysrqb

commit 761d72b53dec3fad177791368d96382349a0d78f
Merge: cde995d8d86f f88d29a1403b
Author: Matthew Finkel 
Date:   Mon Jan 11 21:30:09 2021 +

Merge remote-tracking branch 'gkgl/bug_40274' into 
tor-browser-78.6.0esr-10.5-1

 .../update/updater/nightly_aurora_level3_primary.der  | Bin 1245 -> 1245 bytes
 .../updater/nightly_aurora_level3_secondary.der   | Bin 1245 -> 1245 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.6.0esr-10.5-1] fixup! Bug 32658: Create a new MAR signing key

2021-01-11 Thread sysrqb

commit f88d29a1403b42536de9a13040dda7d9d3a257ad
Author: Georg Koppen 
Date:   Fri Jan 8 07:57:34 2021 +

fixup! Bug 32658: Create a new MAR signing key

Closes #40274.
---
 .../update/updater/nightly_aurora_level3_primary.der  | Bin 1245 -> 1245 bytes
 .../updater/nightly_aurora_level3_secondary.der   | Bin 1245 -> 1245 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der 
b/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der
index a3a3077cc574..d579cf801e1a 100644
Binary files a/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der 
and b/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der differ
diff --git a/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der 
b/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der
index d579cf801e1a..7cbfa77d06e7 100644
Binary files 
a/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der and 
b/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der differ



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/master] Add more featured onion sites. Fix #176

2021-01-11 Thread gus

commit 9bdf61fe93387bb5304e13527dcaef9f8e3ed390
Author: gus 
Date:   Fri Dec 18 14:07:46 2020 -0500

Add more featured onion sites. Fix #176
---
 assets/static/images/onions/png/bbc.png| Bin 0 -> 11312 bytes
 assets/static/images/onions/png/brave.png  | Bin 0 -> 13285 bytes
 assets/static/images/onions/png/debian.png | Bin 0 -> 18153 bytes
 assets/static/images/onions/png/dw.png | Bin 0 -> 56986 bytes
 assets/static/images/onions/png/facebook.png   | Bin 0 -> 96975 bytes
 assets/static/images/onions/png/fop.png| Bin 0 -> 4856 bytes
 .../images/onions/png/frontlinedefenders.png   | Bin 0 -> 360818 bytes
 .../images/onions/png/privacyinternational.png | Bin 0 -> 532301 bytes
 assets/static/images/onions/png/qubesos.png| Bin 0 -> 30163 bytes
 assets/static/images/onions/png/riseup.png | Bin 0 -> 5141 bytes
 assets/static/images/onions/svg/fop.svg| 149 +
 databags/onions.ini|  54 +++-
 12 files changed, 201 insertions(+), 2 deletions(-)

diff --git a/assets/static/images/onions/png/bbc.png 
b/assets/static/images/onions/png/bbc.png
new file mode 100644
index 000..79b62a8
Binary files /dev/null and b/assets/static/images/onions/png/bbc.png differ
diff --git a/assets/static/images/onions/png/brave.png 
b/assets/static/images/onions/png/brave.png
new file mode 100644
index 000..448fe7b
Binary files /dev/null and b/assets/static/images/onions/png/brave.png differ
diff --git a/assets/static/images/onions/png/debian.png 
b/assets/static/images/onions/png/debian.png
new file mode 100644
index 000..8696c4c
Binary files /dev/null and b/assets/static/images/onions/png/debian.png differ
diff --git a/assets/static/images/onions/png/dw.png 
b/assets/static/images/onions/png/dw.png
new file mode 100644
index 000..777eade
Binary files /dev/null and b/assets/static/images/onions/png/dw.png differ
diff --git a/assets/static/images/onions/png/facebook.png 
b/assets/static/images/onions/png/facebook.png
new file mode 100644
index 000..5dbdc75
Binary files /dev/null and b/assets/static/images/onions/png/facebook.png differ
diff --git a/assets/static/images/onions/png/fop.png 
b/assets/static/images/onions/png/fop.png
new file mode 100644
index 000..babf4f0
Binary files /dev/null and b/assets/static/images/onions/png/fop.png differ
diff --git a/assets/static/images/onions/png/frontlinedefenders.png 
b/assets/static/images/onions/png/frontlinedefenders.png
new file mode 100644
index 000..5523489
Binary files /dev/null and 
b/assets/static/images/onions/png/frontlinedefenders.png differ
diff --git a/assets/static/images/onions/png/privacyinternational.png 
b/assets/static/images/onions/png/privacyinternational.png
new file mode 100644
index 000..7d96a26
Binary files /dev/null and 
b/assets/static/images/onions/png/privacyinternational.png differ
diff --git a/assets/static/images/onions/png/qubesos.png 
b/assets/static/images/onions/png/qubesos.png
new file mode 100644
index 000..046c13a
Binary files /dev/null and b/assets/static/images/onions/png/qubesos.png differ
diff --git a/assets/static/images/onions/png/riseup.png 
b/assets/static/images/onions/png/riseup.png
new file mode 100644
index 000..6f3ae3d
Binary files /dev/null and b/assets/static/images/onions/png/riseup.png differ
diff --git a/assets/static/images/onions/svg/fop.svg 
b/assets/static/images/onions/svg/fop.svg
new file mode 100644
index 000..edd3b2d
--- /dev/null
+++ b/assets/static/images/onions/svg/fop.svg
@@ -0,0 +1,149 @@
+
+http://purl.org/dc/elements/1.1/;
+   xmlns:cc="http://creativecommons.org/ns#;
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#;
+   xmlns:svg="http://www.w3.org/2000/svg;
+   xmlns="http://www.w3.org/2000/svg;
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd;
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape;
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 563.7 85"
+   xml:space="preserve"
+   id="svg4547"
+   sodipodi:docname="Freedom of the Press Foundation logo.svg"
+   inkscape:version="0.92.1 r15371">image/svg+xmlhttp://purl.org/dc/dcmitype/StillImage; 
/>
\ No newline at end of file
diff --git a/databags/onions.ini b/databags/onions.ini
index 10645a4..99c440c 100644
--- a/databags/onions.ini
+++ b/databags/onions.ini
@@ -1,9 +1,59 @@
 [propublica]
-link = http://www.propub3r6espa33w.onion/
+link = https://p53lf57qovyuvwsc6xnrppyply3vtqm7l6pcobkmyqsiofyeznfu5uqd.onion
 image = /static/images/onions/png/propublica.png
 label = ProPublica
 
 [nytimes]
-link = http://www.nytimes3xbfgragh.onion/
+link = https://www.nytimes3xbfgragh.onion
 image = /static/images/onions/png/nytimes.png
 label = The New York Times
+
+[dw]
+link = https://www.dwnewsvdyyiamwnp.onion
+image = /static/images/onions/png/dw.png
+label = Deutsche Welle
+
+[bbc]
+link = https://www.bbcnewsv2vjtpsuy.onion 
+image =

[tor-commits] [community/master] Add more featured onions

2021-01-11 Thread gus

commit 5ea020569cf03cbef7b11895490949d47d92917f
Author: gus 
Date:   Mon Jan 11 15:19:30 2021 -0500

Add more featured onions
---
 assets/static/images/onions/png/bbc.png| Bin 11312 -> 2160 bytes
 assets/static/images/onions/png/brave.png  | Bin 13285 -> 11953 bytes
 assets/static/images/onions/png/debian.png | Bin 18153 -> 4231 bytes
 assets/static/images/onions/png/dw.png | Bin 56986 -> 4814 bytes
 assets/static/images/onions/png/facebook.png   | Bin 96975 -> 3047 bytes
 assets/static/images/onions/png/fop.png| Bin 4856 -> 3589 bytes
 .../images/onions/png/frontlinedefenders.png   | Bin 360818 -> 20216 bytes
 assets/static/images/onions/png/nytimes.png| Bin 36728 -> 5382 bytes
 .../images/onions/png/privacyinternational.png | Bin 532301 -> 23607 bytes
 assets/static/images/onions/png/propublica.png | Bin 23196 -> 3306 bytes
 assets/static/images/onions/png/qubesos.png| Bin 30163 -> 14426 bytes
 assets/static/images/onions/png/riseup.png | Bin 5141 -> 7621 bytes
 databags/onions.ini|   2 +-
 13 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/static/images/onions/png/bbc.png 
b/assets/static/images/onions/png/bbc.png
old mode 100644
new mode 100755
index 79b62a8..045a8ee
Binary files a/assets/static/images/onions/png/bbc.png and 
b/assets/static/images/onions/png/bbc.png differ
diff --git a/assets/static/images/onions/png/brave.png 
b/assets/static/images/onions/png/brave.png
old mode 100644
new mode 100755
index 448fe7b..dfdc1cc
Binary files a/assets/static/images/onions/png/brave.png and 
b/assets/static/images/onions/png/brave.png differ
diff --git a/assets/static/images/onions/png/debian.png 
b/assets/static/images/onions/png/debian.png
old mode 100644
new mode 100755
index 8696c4c..0645685
Binary files a/assets/static/images/onions/png/debian.png and 
b/assets/static/images/onions/png/debian.png differ
diff --git a/assets/static/images/onions/png/dw.png 
b/assets/static/images/onions/png/dw.png
old mode 100644
new mode 100755
index 777eade..41216a3
Binary files a/assets/static/images/onions/png/dw.png and 
b/assets/static/images/onions/png/dw.png differ
diff --git a/assets/static/images/onions/png/facebook.png 
b/assets/static/images/onions/png/facebook.png
old mode 100644
new mode 100755
index 5dbdc75..6daf09e
Binary files a/assets/static/images/onions/png/facebook.png and 
b/assets/static/images/onions/png/facebook.png differ
diff --git a/assets/static/images/onions/png/fop.png 
b/assets/static/images/onions/png/fop.png
old mode 100644
new mode 100755
index babf4f0..a800d9b
Binary files a/assets/static/images/onions/png/fop.png and 
b/assets/static/images/onions/png/fop.png differ
diff --git a/assets/static/images/onions/png/frontlinedefenders.png 
b/assets/static/images/onions/png/frontlinedefenders.png
old mode 100644
new mode 100755
index 5523489..5f76843
Binary files a/assets/static/images/onions/png/frontlinedefenders.png and 
b/assets/static/images/onions/png/frontlinedefenders.png differ
diff --git a/assets/static/images/onions/png/nytimes.png 
b/assets/static/images/onions/png/nytimes.png
old mode 100644
new mode 100755
index f732253..19574f4
Binary files a/assets/static/images/onions/png/nytimes.png and 
b/assets/static/images/onions/png/nytimes.png differ
diff --git a/assets/static/images/onions/png/privacyinternational.png 
b/assets/static/images/onions/png/privacyinternational.png
old mode 100644
new mode 100755
index 7d96a26..11856c2
Binary files a/assets/static/images/onions/png/privacyinternational.png and 
b/assets/static/images/onions/png/privacyinternational.png differ
diff --git a/assets/static/images/onions/png/propublica.png 
b/assets/static/images/onions/png/propublica.png
old mode 100644
new mode 100755
index 18e8711..da97d86
Binary files a/assets/static/images/onions/png/propublica.png and 
b/assets/static/images/onions/png/propublica.png differ
diff --git a/assets/static/images/onions/png/qubesos.png 
b/assets/static/images/onions/png/qubesos.png
old mode 100644
new mode 100755
index 046c13a..783fa27
Binary files a/assets/static/images/onions/png/qubesos.png and 
b/assets/static/images/onions/png/qubesos.png differ
diff --git a/assets/static/images/onions/png/riseup.png 
b/assets/static/images/onions/png/riseup.png
old mode 100644
new mode 100755
index 6f3ae3d..99833cf
Binary files a/assets/static/images/onions/png/riseup.png and 
b/assets/static/images/onions/png/riseup.png differ
diff --git a/databags/onions.ini b/databags/onions.ini
index 99c440c..69f703e 100644
--- a/databags/onions.ini
+++ b/databags/onions.ini
@@ -30,7 +30,7 @@ label = Frontline Defenders
 
 [fop]
 link = http://fpfjxcrmw437h6z2xl3w4czl55kvkmxpapg37bbopsafdu7q454byxid.onion
-image = /static/images/onions/svg/fop.svg
+image = /static/images/onions/png/fop.png
 label = Freedom of Press Foundation
 
 [privacyinternational]

[tor-commits] [community/master] Merge branch 'featured-onions'

2021-01-11 Thread gus

commit daa532b371369d64fcc37a70a2463e2e6c4a7161
Merge: bc58546 5ea0205
Author: gus 
Date:   Mon Jan 11 16:24:38 2021 -0500

Merge branch 'featured-onions'

 assets/static/images/onions/png/bbc.png| Bin 0 -> 2160 bytes
 assets/static/images/onions/png/brave.png  | Bin 0 -> 11953 bytes
 assets/static/images/onions/png/debian.png | Bin 0 -> 4231 bytes
 assets/static/images/onions/png/dw.png | Bin 0 -> 4814 bytes
 assets/static/images/onions/png/facebook.png   | Bin 0 -> 3047 bytes
 assets/static/images/onions/png/fop.png| Bin 0 -> 3589 bytes
 .../images/onions/png/frontlinedefenders.png   | Bin 0 -> 20216 bytes
 assets/static/images/onions/png/nytimes.png| Bin 36728 -> 5382 bytes
 .../images/onions/png/privacyinternational.png | Bin 0 -> 23607 bytes
 assets/static/images/onions/png/propublica.png | Bin 23196 -> 3306 bytes
 assets/static/images/onions/png/qubesos.png| Bin 0 -> 14426 bytes
 assets/static/images/onions/png/riseup.png | Bin 0 -> 7621 bytes
 assets/static/images/onions/svg/fop.svg| 149 +
 databags/onions.ini|  54 +++-
 14 files changed, 201 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-build/master] Bug 40162: Build Fenix instrumented tests apk

2021-01-11 Thread sysrqb

commit 7b8f7afa6a079618f6aac691ae002c00ec847c61
Author: Alex Catarineu 
Date:   Fri Dec 11 23:13:12 2020 +0100

Bug 40162: Build Fenix instrumented tests apk
---
 projects/fenix/build| 9 +
 projects/fenix/config   | 2 +-
 projects/fenix/gradle-dependencies-list.txt | 2 ++
 projects/tor-browser/build.android  | 4 
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/projects/fenix/build b/projects/fenix/build
index f1536f1..c91dce3 100644
--- a/projects/fenix/build
+++ b/projects/fenix/build
@@ -37,8 +37,10 @@ cd $builddir-[% c("version") %]
 cp $rootdir/[% c('input_files_by_name/topl') %]/* app/
 cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/
 
+# XXX We need the build variant in lower case. Do something smarter here.
+v=[% c("variant") %]
 [% IF c("var/fetch_gradle_dependencies") %]
-  $GRADLE_HOME/gradle-6.5.1/bin/gradle --debug --no-daemon app:assemble[% 
c('variant') %] -x lint
+  $GRADLE_HOME/gradle-6.5.1/bin/gradle --debug --no-daemon app:assemble[% 
c('variant') %] app:assembleAndroidTest -x lint -PtestBuildType=${v,}
 [% ELSE %]
   # Add our localized strings
   [% FOREACH lang = c('var/locales_mobile');
@@ -63,10 +65,9 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') 
%]/* app/
   fi
 
   version_name='[% c("var/torbrowser_version") %] ([% c("var/fenix_version") 
%]-[% c("variant") %])'
-  $GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon 
-PversionName="$version_name" -Dmaven.repo.local=$gradle_repo app:assemble[% 
c('variant') %] -x lint
-  # XXX We need the build variant in lower case. Do something smarter here.
-  v=[% c("variant") %]
+  $GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon 
-PversionName="$version_name" -Dmaven.repo.local=$gradle_repo app:assemble[% 
c('variant') %] app:assembleAndroidTest -x lint -PtestBuildType=${v,}
   cp app/build/outputs/apk/${v,}/*.apk $distdir/[% project %]
+  cp app/build/outputs/apk/androidTest/${v,}/app-${v,}-androidTest.apk 
$distdir/[% project %]
 
   cd $distdir
   [% c('tar', {
diff --git a/projects/fenix/config b/projects/fenix/config
index 592972b..cb2bafc 100644
--- a/projects/fenix/config
+++ b/projects/fenix/config
@@ -14,7 +14,7 @@ var:
   container:
 use_container: 1
   # This should be updated when the list of gradle dependencies is changed.
-  gradle_dependencies_version: 14
+  gradle_dependencies_version: 15
   # Switch to make it easier to grab all dependencies during a dry-run.
   # Note: Use the commit that integrates Tor.
   fetch_gradle_dependencies: 0
diff --git a/projects/fenix/gradle-dependencies-list.txt 
b/projects/fenix/gradle-dependencies-list.txt
index e056e9a..fbd0718 100644
--- a/projects/fenix/gradle-dependencies-list.txt
+++ b/projects/fenix/gradle-dependencies-list.txt
@@ -461,6 +461,8 @@ 
dbc2bb04ecb002b9f4046263ccad996f4a3d3c59a0cc98837e300a6700571f7c | https://jcent
 4f8992dde784509e80917cabbc8406a7137e5f2ba2c1ae5b7250fc182a45bd88 | 
https://jcenter.bintray.com/com/squareup/okhttp3/okhttp/4.9.0/okhttp-4.9.0.pom
 e58c97406a6bb1138893750299ac63c6aa04b38b6b49eae1bfcad1a63ef9ba1b | 
https://jcenter.bintray.com/com/squareup/okio/okio/2.2.2/okio-2.2.2.jar
 fd621988f7f6957025735dc6dd090b00a20f3a3bb8d77ca79036077f629b140b | 
https://jcenter.bintray.com/com/squareup/okio/okio/2.2.2/okio-2.2.2.pom
+4496b06e73982fcdd8a5393f46e5df2ce2fa4465df5895454cac68a32f09bbc8 | 
https://jcenter.bintray.com/com/squareup/okio/okio/2.8.0/okio-2.8.0.jar
+26214068fd4c7f437ac8fe8576802a9a9dc151c457582807ad9af2af2e8c9481 | 
https://jcenter.bintray.com/com/squareup/okio/okio/2.8.0/okio-2.8.0.pom
 1d8518e3ac7532a104e4f7be77def37c982e530723c6bdb3d67708cce2b0c2c4 | 
https://jcenter.bintray.com/com/sun/activation/all/1.2.0/all-1.2.0.pom
 993302b16cd7056f21e779cc577d175a810bb4900ef73cd8fbf2b50f928ba9ce | 
https://jcenter.bintray.com/com/sun/activation/javax.activation/1.2.0/javax.activation-1.2.0.jar
 f879b6e945854c6900b0dbee1c8384d7ab3de7e157fd7ac84937405c416d2a5e | 
https://jcenter.bintray.com/com/sun/activation/javax.activation/1.2.0/javax.activation-1.2.0.pom
diff --git a/projects/tor-browser/build.android 
b/projects/tor-browser/build.android
index 71b9d36..e9354bd 100644
--- a/projects/tor-browser/build.android
+++ b/projects/tor-browser/build.android
@@ -4,6 +4,8 @@ assets_dir=assets
 ext_dir=$assets_dir/extensions
 qa_apk=[% dest_dir %]/[% c('filename') %]/tor-browser-[% c("version") %]-[% 
c("var/osname") %]-multi-qa.apk
 apk=$rootdir/fenix/app-[% c("var/abi") %]-*.apk
+test_out_apk=[% dest_dir %]/[% c('filename') %]/tor-browser-[% c("version") 
%]-[% c("var/osname") %]-androidTest.apk
+test_in_apk=$rootdir/fenix/app-*-androidTest.apk
 
 tar xavf $rootdir/[% c('input_files_by_name/fenix') %]
 
@@ -32,3 +34,5 @@ mv $rootdir/allowed_addons.json 
$assets_dir/allowed_addons.json
 # Sign a QA build. This .apk is not a debug version and doesn't contain a debug
 # flag in the manifest.
 java -jar

[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'acatgl/40162+2'

2021-01-11 Thread sysrqb

commit cada2163fd6c33e4600dc577751c6f8135c62096
Merge: ae8ab9d 7b8f7af
Author: Matthew Finkel 
Date:   Mon Jan 11 21:19:44 2021 +

Merge remote-tracking branch 'acatgl/40162+2'

 projects/fenix/build| 9 +
 projects/fenix/config   | 2 +-
 projects/fenix/gradle-dependencies-list.txt | 2 ++
 projects/tor-browser/build.android  | 4 
 4 files changed, 12 insertions(+), 5 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

2021-01-11 Thread translation

commit 7c5abdde629d8e9e03c487dfd9045a65648671cf
Author: Translation commit bot 
Date:   Mon Jan 11 21:17:06 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+el.po | 14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/contents+el.po b/contents+el.po
index fb2fe6fb30..0ad127d920 100644
--- a/contents+el.po
+++ b/contents+el.po
@@ -2748,6 +2748,8 @@ msgid ""
 "To use a pluggable transport, click on the settings icon when starting Tor "
 "Browser for the first time."
 msgstr ""
+"ÎÎ¹Î± Î½Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ Î¼Î¹Î± Î¼ÎµÏÎ±Î²Î±Î»Î»ÏÎ¼ÎµÎ½Î· 
Î¼ÎµÏÎ±ÏÎ¿ÏÎ¬ ÏÎ±ÏÎ®ÏÏÎµ ÏÏÎ¿ ÎµÎ¹ÎºÎ¿Î½Î¯Î´Î¹Î¿ ÏÏÎ½ "
+"ÏÏÎ¸Î¼Î¯ÏÎµÏÎ½ ÏÏÎ±Î½ Î¿ Tor Browser ÎµÎºÎºÎ¹Î½ÎµÎ¯ Î³Î¹Î± ÏÏÏÏÎ· 
ÏÎ¿ÏÎ¬."
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2755,6 +2757,8 @@ msgid ""
 "The first screen asks if access to the Tor network is censored on your "
 "connection. Click on the switch to toggle it."
 msgstr ""
+"Î ÏÏÏÏÎ· Î¿Î¸ÏÎ½Î· ÏÏÏÎ¬ Î±Î½ Î· ÏÏÏÏÎ²Î±ÏÎ· ÏÏÎ¿ Î´Î¯ÎºÏÏ
Î¿ Tor Î»Î¿Î³Î¿ÎºÏÎ¯Î½ÎµÏÎ±Î¹ ÏÏÎ· ÏÏÏÎ± ÏÎ±Ï. "
+"Î Î±ÏÎ®ÏÏÎµ ÏÎ¿Î½ Î´Î¹Î±ÎºÏÏÏÎ· Î³Î¹Î± Î½Î± 
ÎµÏÎ¹Î²ÎµÎ²Î±Î¹ÏÏÎµÏÎµ."
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2773,6 +2777,8 @@ msgid ""
 "The next screen provides the option to either use a built-in bridge or "
 "custom bridge."
 msgstr ""
+"Î ÎµÏÏÎ¼ÎµÎ½Î· Î¿Î¸ÏÎ½Î· Î´Î¯Î½ÎµÎ¹ ÏÎ·Î½ ÎµÏÎ¹Î»Î¿Î³Î® ÏÏÎ®ÏÎ·Ï 
ÏÎ·Ï ÎµÎ½ÏÏÎ¼Î±ÏÏÎ¼ÎÎ½Î·Ï Î³ÎÏÏÏÎ±Ï Î® ÎºÎ¬ÏÎ¿Î¹Î±Ï"
+" ÏÏÎ¿ÏÎ±ÏÎ¼Î¿ÏÎ¼ÎÎ½Î·Ï Î³ÎÏÏÏÎ±Ï."
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2780,6 +2786,8 @@ msgid ""
 "With the \"Select a bridge\" option, you will have two options: \"obfs4\" "
 "and \"meek-azure\"."
 msgstr ""
+"ÎÎµ ÏÎ·Î½ ÎµÏÎ¹Î»Î¿Î³Î® Â«ÎÏÎ¹Î»ÎÎ¾ÏÎµ Î¼Î¹Î± Î³ÎÏÏÏÎ±Â» Î¸Î± 
ÎÏÎµÏÎµ Î´ÏÎ¿ ÎµÏÎ¹Î»Î¿Î³ÎÏ: Â«obfs4Â» ÎºÎ±Î¹ "
+"Â«meek-azureÂ»."
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2809,6 +2817,8 @@ msgid ""
 "If you choose the \"Provide a Bridge I know\" option, then you have to enter"
 " a [bridge address](https://tb-manual.torproject.org/bridges/)."
 msgstr ""
+"ÎÎ½ ÎµÏÎ¹Î»ÎÎ¾ÎµÏÎµ ÏÎ·Î½ Î»ÎµÎ¹ÏÎ¿ÏÏÎ³Î¯Î± Â«Î Î±ÏÎ¿ÏÎ® Î³ÎÏÏ
ÏÎ±Ï ÏÎ¿Ï Î³Î½ÏÏÎ¯Î¶ÏÂ» ÏÏÏÎµ Î¸Î± ÏÏÎÏÎµÎ¹ Î½Î± "
+"ÎµÎ¹ÏÎ¬Î³ÎµÏÎµ Î¼Î¹Î± [Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· Î³ÎÏÏ
ÏÎ±Ï](https://tb-manual.torproject.org/bridges)."
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2857,11 +2867,13 @@ msgid ""
 "When Tor Browser is running, you would see so in your phone's notification "
 "panel along with the button \"NEW IDENTITY\"."
 msgstr ""
+"ÎÏÎ±Î½ Î¿ Tor Browser ÎµÎºÏÎµÎ»ÎµÎ¯ÏÎµ, Î¸Î± ÏÎ¿ Î´ÎµÎ¯ÏÎµ ÏÏÎ·Î½ 
ÏÎµÏÎ¹Î¿ÏÎ® ÎµÎ¹Î´Î¿ÏÎ¿Î¹Î®ÏÎµÏÎ½ ÏÎ¿Ï "
+"ÏÎ·Î»ÎµÏÏÎ½Î¿Ï ÏÎ±Ï Î¼Î±Î¶Î¯ Î¼Îµ ÏÎ¿ ÏÎ»Î®ÎºÏÏÎ¿ Â«ÎÎÎ 
Î¤ÎÎ¥Î¤ÎÎ¤ÎÎ¤ÎÂ»."
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
 msgid "Clicking on this button will provide you with a new identity."
-msgstr ""
+msgstr "Î Î±ÏÏÎ½ÏÎ±Ï ÏÎ¿ ÎºÎ¿ÏÎ¼ÏÎ¯ Î±ÏÏÏ Î¸Î± Î´Î·Î¼Î¹Î¿Ï
ÏÎ³Î·Î¸ÎµÎ¯ Î¼Î¹Î± Î½ÎÎ± ÏÎ±ÏÏÏÏÎ·ÏÎ±."
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.5] Add another entry to the 0.4.5.3-rc changelog

2021-01-11 Thread nickm

commit 34cea7a540cc2fdff8d51327de085c478c4c40af
Author: Nick Mathewson 
Date:   Mon Jan 11 15:59:25 2021 -0500

Add another entry to the 0.4.5.3-rc changelog
---
 ChangeLog | 5 -
 changes/40241 | 4 
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 961ac14eba..a958049948 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,7 +20,10 @@ Changes in version 0.4.5.3-rc - 2021-01-12
   authority's approved-routers file, and update the description of
   the "!invalid" directive. Closes ticket 40188.
 
-  o Minor bugfixes (build):
+  o Minor bugfixes (compilation):
+- Fix a compilation warning about unreachable fallthrough
+  annotations when building with "--enable-all-bugs-are-fatal" on
+  some compilers. Fixes bug 40241; bugfix on 0.3.5.4-alpha.
 - Fix the "--enable-static-tor" switch to properly set the "-static"
   compile option onto the tor binary only. Fixes bug 40111; bugfix
   on 0.2.3.1-alpha.
diff --git a/changes/40241 b/changes/40241
deleted file mode 100644
index c9b2e2c011..00
--- a/changes/40241
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (compilation):
-- Fix a compilation warning about unreachable fallthrough annotations
-  when building with "--enable-all-bugs-are-fatal" on some compilers.
-  Fixes bug 40241; bugfix on 0.3.5.4-alpha.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2021-01-11 Thread translation

commit 2226f3d452a1e7522d259b2fe6a877584d447c26
Author: Translation commit bot 
Date:   Mon Jan 11 20:48:19 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+el.po | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/contents+el.po b/contents+el.po
index 981798b8c4..d792ffbf22 100644
--- a/contents+el.po
+++ b/contents+el.po
@@ -12,6 +12,7 @@
 # Sofia K., 2020
 # A Papac , 2020
 # George Kitsoukakis , 2020
+# anvo , 2021
 # 
 msgid ""
 msgstr ""
@@ -19,7 +20,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-12-21 16:01+EST\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: George Kitsoukakis , 2020\n"
+"Last-Translator: anvo , 2021\n"
 "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -6098,6 +6099,10 @@ msgid ""
 "who want an extra layer of security because they're worried somebody will "
 "recognize that they are contacting a public Tor relay IP address."
 msgstr ""
+"ÎÎ¹ Î³ÎÏÏÏÎµÏ ÎµÎ¯Î½Î±Î¹ ÏÏÎ®ÏÎ¹Î¼ÎµÏ Î³Î¹Î± ÏÏÎ®ÏÏÎµÏ ÏÎ¿Ï 
Tor ÏÎ¿Ï Î¶Î¿ÏÎ½ ÏÏÏ ÎºÎ±ÏÎ±ÏÎ¹ÎµÏÏÎ¹ÎºÎ¬ "
+"ÎºÎ±Î¸ÎµÏÏÏÏÎ± ÎºÎ±Î¹ Î³Î¹Î± Î±Î½Î¸ÏÏÏÎ¿ÏÏ ÏÎ¿Ï ÎµÏÎ¹Î¸ÏÎ¼Î¿ÏÎ½ 
ÎµÏÎ¹ÏÎ»ÎÎ¿Î½ ÎµÏÎ¯ÏÎµÎ´Î¿ Î±ÏÏÎ¬Î»ÎµÎ¹Î±Ï ÎµÏÎµÎ¹Î´Î® "
+"Î±Î½Î·ÏÏÏÎ¿ÏÎ½ ÏÏÎ¹ ÎºÎ¬ÏÎ¿Î¹Î¿Ï Î¸Î± ÎºÎ±ÏÎ±Î»Î¬Î²ÎµÎ¹ ÏÏÎ¹ 
ÎµÏÎ¹ÎºÎ¿Î¹Î½ÏÎ½Î¿ÏÎ½ Î¼Îµ Î¼Î¹Î± Î´Î·Î¼ÏÏÎ¹Î± ÎÎ¡ "
+"Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· Î±Î½Î±Î¼ÎµÏÎ¬Î´Î¿ÏÎ·Ï ÏÎ¿Ï Tor."
 
 #: https//support.torproject.org/censorship/censorship-7/
 #: (content/censorship/censorship-7/contents+en.lrquestion.description)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

2021-01-11 Thread translation

commit 57fee41837bf9f7c44f2b2afbba172c92f1abbda
Author: Translation commit bot 
Date:   Mon Jan 11 20:47:16 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+el.po | 42 --
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/contents+el.po b/contents+el.po
index ac00b9075b..fb2fe6fb30 100644
--- a/contents+el.po
+++ b/contents+el.po
@@ -2516,6 +2516,8 @@ msgid ""
 "The Guardian Project provides Tor Browser for Android on their F-Droid "
 "repository."
 msgstr ""
+"Î¤Î¿ Guardian Project ÏÎ±ÏÎÏÎµÎ¹ ÏÎ¿Î½ Tor Browser Î³Î¹Î± Android 
Î¼ÎÏÏ ÏÎ¿Ï F-Droid "
+"Î±ÏÎ¿Î¸ÎµÏÎ·ÏÎ¯Î¿Ï ÏÎ¿ÏÏ."
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2553,7 +2555,7 @@ msgstr "4. ÎÎ¬ÏÏ Î±ÏÏ \"ÎÎ¹ ÎµÏÎ±ÏÎ¼Î¿Î³ÎÏ 
Î¼Î¿Ï\", Î±Î½Î¿Î¯Î¾ÏÎµ Ï
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
 msgid "5. Toggle \"Guardian Project Official Releases\" as enabled."
-msgstr ""
+msgstr "5. ÎÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î®ÏÏÎµ ÏÎ¹Ï Â«Guardian Project Official 
ReleasesÂ»."
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2561,16 +2563,18 @@ msgid ""
 "6. Now F-Droid downloads the list of apps from the Guardian Project's "
 "repository (Note: this may take a few minutes)."
 msgstr ""
+"6. Î¤Î¿ F-Droid ÎºÎ±ÏÎµÎ²Î¬Î¶ÎµÎ¹ ÏÏÏÎ± ÏÎ¿Î½ ÎºÎ±ÏÎ¬Î»Î¿Î³Î¿ 
ÎµÏÎ±ÏÎ¼Î¿Î³ÏÎ½ Î±ÏÏ ÏÎ¿ Î±ÏÎ¿Î¸ÎµÏÎ®ÏÎ¹Î¿ ÏÎ¿Ï "
+"Guardian Project (Î£Î·Î¼ÎµÎ¯ÏÏÎ·: Î±ÏÏÏ Î¯ÏÏÏ Î´Î¹Î±ÏÎºÎÏÎµÎ¹ 
Î»Î¯Î³Î± Î»ÎµÏÏÎ¬)."
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
 msgid "7. Tap the Back button at the upper-left-hand corner."
-msgstr ""
+msgstr "7. ÎÎºÎ¿ÏÎ¼ÏÎ®ÏÏÎµ ÏÎ¿ ÎºÎ¿ÏÎ¼ÏÎ¯ Î Î¯ÏÏ ÏÏÎ·Î½ Î¬Î½Ï 
Î±ÏÎ¹ÏÏÎµÏÎ® Î³ÏÎ½Î¯Î±."
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
 msgid "8. Open \"Latest\" at the lower-left-hand corner."
-msgstr ""
+msgstr "8. ÎÎ½Î¿Î¯Î¾ÏÎµ Â«LatestÂ» ÏÏÎ·Î½ ÎºÎ¬ÏÏ Î±ÏÎ¹ÏÏÎµÏÎ® 
Î³ÏÎ½Î¯Î±."
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2578,16 +2582,20 @@ msgid ""
 "10. Open the search screen by tapping the magnifying glass at the lower-"
 "right side."
 msgstr ""
+"10. ÎÎ½Î¿Î¯Î¾ÏÎµ ÏÎ·Î½ Î¿Î¸ÏÎ½Î· Î±Î½Î±Î¶Î®ÏÎ·ÏÎ·Ï 
Î±Î³Î³Î¯Î¶Î¿Î½ÏÎ±Ï ÏÎ¿Î½ Î¼ÎµÎ³ÎµÎ¸ÏÎ½ÏÎ¹ÎºÏ ÏÎ±ÎºÏ ÏÏÎ·Î½ ÎºÎ¬ÏÏ "
+"Î´ÎµÎ¾Î¹Î¬ ÏÎ»ÎµÏÏÎ¬."
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
 msgid "11. Search for \"Tor Browser for Android\"."
-msgstr ""
+msgstr "11. ÎÎ½Î±Î¶Î·ÏÎ®ÏÏÎµ Â«Tor Browser for AndroidÂ»."
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
 msgid "12. Open the query result by \"The Tor Project\" and install."
 msgstr ""
+"12. ÎÎ½Î¿Î¯Î¾ÏÎµ ÏÎ¿ Î±ÏÎ¿ÏÎÎ»ÎµÏÎ¼Î± ÏÎ·Ï Î±Î½Î±Î¶Î®ÏÎ·ÏÎ·Ï Î¼Îµ 
ÏÎ½Î¿Î¼Î± Â«The Tor ProjectÂ» ÎºÎ±Î¹ "
+"ÎµÎ³ÎºÎ±ÏÎ±ÏÏÎ®ÏÏÎµ."
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2608,7 +2616,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
 msgid "### RUNNING TOR BROWSER FOR ANDROID FOR THE FIRST TIME"
-msgstr ""
+msgstr "###ÎÎÎ¤ÎÎÎÎ£Î Î¤ÎÎ¥ TOR BROWSER ÎÎÎ ANDROID ÎÎÎ Î 
Î¡Î©Î¤Î Î¦ÎÎ¡Î"
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2617,6 +2625,9 @@ msgid ""
 "connect directly to the Tor network, or to configure Tor Browser for your "
 "connection with the settings icon."
 msgstr ""
+"ÎÏÎ±Î½ ÎµÎºÏÎµÎ»ÎµÎ¯ÏÎµ ÏÎ¿Î½ Tor Browser Î³Î¹Î± ÏÏÏÏÎ· ÏÎ¿ÏÎ¬ 
Î¸Î± ÎµÎ¼ÏÎ±Î½Î¹ÏÏÎ¿ÏÎ½ Î¿Î¹ ÎµÏÎ¹Î»Î¿Î³ÎÏ "
+"ÎµÎ¯ÏÎµ Î³Î¹Î± Î¬Î¼ÎµÏÎ· Î±ÏÎµÏÎ¸ÎµÎ¯Î±Ï ÏÏÎ½Î´ÎµÏÎ· Î¼Îµ ÏÎ¿ 
Î´Î¯ÎºÏÏÎ¿ Tor Î® Î³Î¹Î± ÏÏÎ¿ÏÎ±ÏÎ¼Î¿Î³Î® ÏÎ¿Ï Tor "
+"Browser."
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2638,6 +2649,8 @@ msgid ""
 "Once clicked, changing sentences will appear at the bottom of the screen, "
 "indicating Torâs connection progress."
 msgstr ""
+"ÎÏÎ±Î½ ÏÎ±ÏÎ·Î¸ÎµÎ¯, ÏÏÎ¿ ÎºÎ¬ÏÏ Î¼ÎÏÎ¿Ï ÏÎ·Ï Î¿Î¸ÏÎ½Î·Ï Î¸Î± 
ÎµÎ¼ÏÎ±Î½Î¯Î¶Î¿Î½ÏÎ±Î¹ Î´Î¹Î¬ÏÎ¿ÏÎµÏ ÎµÎ½Î´ÎµÎ¯Î¾ÎµÎ¹Ï "
+"ÏÎ¿Ï Î¸Î± ÏÎ·Î¼Î±Î¯Î½Î¿ÏÎ½ ÏÎ·Î½ ÏÏÏÎ¿Î´Î¿ ÏÏÎ½Î´ÎµÏÎ·Ï ÏÎ¿Ï 
Tor."
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2646,6 +2659,10 @@ msgid ""
 " at a certain point, see the [Troubleshooting](https://tb-;
 "manual.torproject.org/troubleshooting) page for help solving the problem."
 msgstr ""
+"ÎÎ½ Î· ÏÏÎ½Î´ÎµÏÎ® ÏÎ±Ï ÎµÎ¯Î½Î±Î¹ ÏÏÎµÏÎ¹ÎºÎ¬ Î³ÏÎ®Î³Î¿ÏÎ· 
Î±Î»Î»Î¬ ÏÎ¿ ÎµÎ½ Î»ÏÎ³Ï

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

2021-01-11 Thread nickm

commit 9c268b66ba72203aa2fc7e5c58b35cc883712886
Merge: d31beeef9f d1f4741606
Author: Nick Mathewson 
Date:   Mon Jan 11 14:46:13 2021 -0500

Merge branch 'maint-0.4.5'

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.3

2021-01-11 Thread nickm

commit 4b39f46a611ff48ceb7ea212dbcdb2e5b6d26d3b
Merge: 2e7cbd7a9c 6c0f15500b
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:28 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4

2021-01-11 Thread nickm

commit 5a822b462aaa8cf3cd749c253bb1e9e5f4f37fa2
Merge: 77bb4b0838 4b39f46a61
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:29 2021 -0500

Merge branch 'maint-0.4.3' into maint-0.4.4

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.4.4' into maint-0.4.5

2021-01-11 Thread nickm

commit d1f474160638e10478a2ab14fb93b1e8b6a720a2
Merge: edc9fda4f5 5a822b462a
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:29 2021 -0500

Merge branch 'maint-0.4.4' into maint-0.4.5

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'ticket40241_035' into maint-0.3.5

2021-01-11 Thread nickm

commit 6c0f15500b3aa027c90d1c397d4504bb2f4dd41b
Merge: fcae26adf7 ccdbbae4ec
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:14 2021 -0500

Merge branch 'ticket40241_035' into maint-0.3.5

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Fix warnings in current debian-hardened CI.

2021-01-11 Thread nickm

commit ccdbbae4eceb8f6c508b67d53d6242961bf2e6eb
Author: Nick Mathewson 
Date:   Mon Jan 11 14:25:56 2021 -0500

Fix warnings in current debian-hardened CI.

We're getting "fallback annotation annotation in unreachable code"
warnings when we build with ALL_BUGS_ARE_FATAL. This patch fixes
that.

Fixes bug 40241.  Bugfix on 0.3.5.4-alpha.
---
 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/changes/40241 b/changes/40241
new file mode 100644
index 00..c9b2e2c011
--- /dev/null
+++ b/changes/40241
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+- Fix a compilation warning about unreachable fallthrough annotations
+  when building with "--enable-all-bugs-are-fatal" on some compilers.
+  Fixes bug 40241; bugfix on 0.3.5.4-alpha.
diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c
index 299ab88576..bdd82f3138 100644
--- a/src/core/or/channeltls.c
+++ b/src/core/or/channeltls.c
@@ -1225,8 +1225,9 @@ channel_tls_handle_var_cell(var_cell_t *var_cell, 
or_connection_t *conn)
* the v2 and v3 handshakes. */
   /* But that should be happening any longer've disabled bufferevents. */
   tor_assert_nonfatal_unreached_once();
-
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 case OR_CONN_STATE_TLS_SERVER_RENEGOTIATING:
   if (!(command_allowed_before_handshake(var_cell->command))) {
 log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c
index 03d495cdfd..83e2124498 100644
--- a/src/core/or/circuitlist.c
+++ b/src/core/or/circuitlist.c
@@ -787,7 +787,9 @@ circuit_purpose_to_controller_hs_state_string(uint8_t 
purpose)
  "Unrecognized circuit purpose: %d",
  (int)purpose);
   tor_fragile_assert();
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 
 case CIRCUIT_PURPOSE_OR:
 case CIRCUIT_PURPOSE_C_GENERAL:
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c
index 8d9230b66b..c930fe244f 100644
--- a/src/feature/client/entrynodes.c
+++ b/src/feature/client/entrynodes.c
@@ -2263,7 +2263,9 @@ entry_guards_note_guard_success(guard_selection_t *gs,
   break;
 default:
   tor_assert_nonfatal_unreached();
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 case GUARD_CIRC_STATE_USABLE_IF_NO_BETTER_GUARD:
   if (guard->is_primary) {
 /*  #20832 -- I don't actually like this logic. It seems to make
diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c
index 5c9dbea8e3..acff805c0e 100644
--- a/src/feature/rend/rendclient.c
+++ b/src/feature/rend/rendclient.c
@@ -819,7 +819,9 @@ rend_client_report_intro_point_failure(extend_info_t 
*failed_intro,
 log_warn(LD_BUG, "Unknown failure type %u. Removing intro point.",
  failure_type);
 tor_fragile_assert();
+#ifndef ALL_BUGS_ARE_FATAL
 FALLTHROUGH;
+#endif
   case INTRO_POINT_FAILURE_GENERIC:
 rend_cache_intro_failure_note(failure_type,
   (uint8_t *)failed_intro->identity_digest,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5

2021-01-11 Thread nickm

commit d63278b1d16afd29cf96e057146fe3f755e3234b
Merge: d4253bbea0 d1f4741606
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:29 2021 -0500

Merge branch 'maint-0.4.5' into release-0.4.5

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.4] Fix warnings in current debian-hardened CI.

2021-01-11 Thread nickm

commit ccdbbae4eceb8f6c508b67d53d6242961bf2e6eb
Author: Nick Mathewson 
Date:   Mon Jan 11 14:25:56 2021 -0500

Fix warnings in current debian-hardened CI.

We're getting "fallback annotation annotation in unreachable code"
warnings when we build with ALL_BUGS_ARE_FATAL. This patch fixes
that.

Fixes bug 40241.  Bugfix on 0.3.5.4-alpha.
---
 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/changes/40241 b/changes/40241
new file mode 100644
index 00..c9b2e2c011
--- /dev/null
+++ b/changes/40241
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+- Fix a compilation warning about unreachable fallthrough annotations
+  when building with "--enable-all-bugs-are-fatal" on some compilers.
+  Fixes bug 40241; bugfix on 0.3.5.4-alpha.
diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c
index 299ab88576..bdd82f3138 100644
--- a/src/core/or/channeltls.c
+++ b/src/core/or/channeltls.c
@@ -1225,8 +1225,9 @@ channel_tls_handle_var_cell(var_cell_t *var_cell, 
or_connection_t *conn)
* the v2 and v3 handshakes. */
   /* But that should be happening any longer've disabled bufferevents. */
   tor_assert_nonfatal_unreached_once();
-
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 case OR_CONN_STATE_TLS_SERVER_RENEGOTIATING:
   if (!(command_allowed_before_handshake(var_cell->command))) {
 log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c
index 03d495cdfd..83e2124498 100644
--- a/src/core/or/circuitlist.c
+++ b/src/core/or/circuitlist.c
@@ -787,7 +787,9 @@ circuit_purpose_to_controller_hs_state_string(uint8_t 
purpose)
  "Unrecognized circuit purpose: %d",
  (int)purpose);
   tor_fragile_assert();
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 
 case CIRCUIT_PURPOSE_OR:
 case CIRCUIT_PURPOSE_C_GENERAL:
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c
index 8d9230b66b..c930fe244f 100644
--- a/src/feature/client/entrynodes.c
+++ b/src/feature/client/entrynodes.c
@@ -2263,7 +2263,9 @@ entry_guards_note_guard_success(guard_selection_t *gs,
   break;
 default:
   tor_assert_nonfatal_unreached();
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 case GUARD_CIRC_STATE_USABLE_IF_NO_BETTER_GUARD:
   if (guard->is_primary) {
 /*  #20832 -- I don't actually like this logic. It seems to make
diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c
index 5c9dbea8e3..acff805c0e 100644
--- a/src/feature/rend/rendclient.c
+++ b/src/feature/rend/rendclient.c
@@ -819,7 +819,9 @@ rend_client_report_intro_point_failure(extend_info_t 
*failed_intro,
 log_warn(LD_BUG, "Unknown failure type %u. Removing intro point.",
  failure_type);
 tor_fragile_assert();
+#ifndef ALL_BUGS_ARE_FATAL
 FALLTHROUGH;
+#endif
   case INTRO_POINT_FAILURE_GENERIC:
 rend_cache_intro_failure_note(failure_type,
   (uint8_t *)failed_intro->identity_digest,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.3' into maint-0.4.4

2021-01-11 Thread nickm

commit 5a822b462aaa8cf3cd749c253bb1e9e5f4f37fa2
Merge: 77bb4b0838 4b39f46a61
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:29 2021 -0500

Merge branch 'maint-0.4.3' into maint-0.4.4

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.3

2021-01-11 Thread nickm

commit 4b39f46a611ff48ceb7ea212dbcdb2e5b6d26d3b
Merge: 2e7cbd7a9c 6c0f15500b
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:28 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.5] Merge branch 'ticket40241_035' into maint-0.3.5

2021-01-11 Thread nickm

commit 6c0f15500b3aa027c90d1c397d4504bb2f4dd41b
Merge: fcae26adf7 ccdbbae4ec
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:14 2021 -0500

Merge branch 'ticket40241_035' into maint-0.3.5

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5

2021-01-11 Thread nickm

commit d1f474160638e10478a2ab14fb93b1e8b6a720a2
Merge: edc9fda4f5 5a822b462a
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:29 2021 -0500

Merge branch 'maint-0.4.4' into maint-0.4.5

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4

2021-01-11 Thread nickm

commit 5a822b462aaa8cf3cd749c253bb1e9e5f4f37fa2
Merge: 77bb4b0838 4b39f46a61
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:29 2021 -0500

Merge branch 'maint-0.4.3' into maint-0.4.4

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

2021-01-11 Thread nickm

commit 4b39f46a611ff48ceb7ea212dbcdb2e5b6d26d3b
Merge: 2e7cbd7a9c 6c0f15500b
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:28 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.3] Merge branch 'ticket40241_035' into maint-0.3.5

2021-01-11 Thread nickm

commit 6c0f15500b3aa027c90d1c397d4504bb2f4dd41b
Merge: fcae26adf7 ccdbbae4ec
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:14 2021 -0500

Merge branch 'ticket40241_035' into maint-0.3.5

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.4] Merge branch 'ticket40241_035' into maint-0.3.5

2021-01-11 Thread nickm

commit 6c0f15500b3aa027c90d1c397d4504bb2f4dd41b
Merge: fcae26adf7 ccdbbae4ec
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:14 2021 -0500

Merge branch 'ticket40241_035' into maint-0.3.5

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4

2021-01-11 Thread nickm

commit e0caedee163b6861dc2e6be23a4e21c39503172d
Merge: 498807b499 5a822b462a
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:29 2021 -0500

Merge branch 'maint-0.4.4' into release-0.4.4

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3

2021-01-11 Thread nickm

commit 33f14fc6d35710a8dc69fb2401191bf10d360f30
Merge: 9b654b95ec 4b39f46a61
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:29 2021 -0500

Merge branch 'maint-0.4.3' into release-0.4.3

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.5] Fix warnings in current debian-hardened CI.

2021-01-11 Thread nickm

commit ccdbbae4eceb8f6c508b67d53d6242961bf2e6eb
Author: Nick Mathewson 
Date:   Mon Jan 11 14:25:56 2021 -0500

Fix warnings in current debian-hardened CI.

We're getting "fallback annotation annotation in unreachable code"
warnings when we build with ALL_BUGS_ARE_FATAL. This patch fixes
that.

Fixes bug 40241.  Bugfix on 0.3.5.4-alpha.
---
 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/changes/40241 b/changes/40241
new file mode 100644
index 00..c9b2e2c011
--- /dev/null
+++ b/changes/40241
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+- Fix a compilation warning about unreachable fallthrough annotations
+  when building with "--enable-all-bugs-are-fatal" on some compilers.
+  Fixes bug 40241; bugfix on 0.3.5.4-alpha.
diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c
index 299ab88576..bdd82f3138 100644
--- a/src/core/or/channeltls.c
+++ b/src/core/or/channeltls.c
@@ -1225,8 +1225,9 @@ channel_tls_handle_var_cell(var_cell_t *var_cell, 
or_connection_t *conn)
* the v2 and v3 handshakes. */
   /* But that should be happening any longer've disabled bufferevents. */
   tor_assert_nonfatal_unreached_once();
-
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 case OR_CONN_STATE_TLS_SERVER_RENEGOTIATING:
   if (!(command_allowed_before_handshake(var_cell->command))) {
 log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c
index 03d495cdfd..83e2124498 100644
--- a/src/core/or/circuitlist.c
+++ b/src/core/or/circuitlist.c
@@ -787,7 +787,9 @@ circuit_purpose_to_controller_hs_state_string(uint8_t 
purpose)
  "Unrecognized circuit purpose: %d",
  (int)purpose);
   tor_fragile_assert();
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 
 case CIRCUIT_PURPOSE_OR:
 case CIRCUIT_PURPOSE_C_GENERAL:
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c
index 8d9230b66b..c930fe244f 100644
--- a/src/feature/client/entrynodes.c
+++ b/src/feature/client/entrynodes.c
@@ -2263,7 +2263,9 @@ entry_guards_note_guard_success(guard_selection_t *gs,
   break;
 default:
   tor_assert_nonfatal_unreached();
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 case GUARD_CIRC_STATE_USABLE_IF_NO_BETTER_GUARD:
   if (guard->is_primary) {
 /*  #20832 -- I don't actually like this logic. It seems to make
diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c
index 5c9dbea8e3..acff805c0e 100644
--- a/src/feature/rend/rendclient.c
+++ b/src/feature/rend/rendclient.c
@@ -819,7 +819,9 @@ rend_client_report_intro_point_failure(extend_info_t 
*failed_intro,
 log_warn(LD_BUG, "Unknown failure type %u. Removing intro point.",
  failure_type);
 tor_fragile_assert();
+#ifndef ALL_BUGS_ARE_FATAL
 FALLTHROUGH;
+#endif
   case INTRO_POINT_FAILURE_GENERIC:
 rend_cache_intro_failure_note(failure_type,
   (uint8_t *)failed_intro->identity_digest,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

2021-01-11 Thread nickm

commit 5aceb7ca192b42fe1cdd940465a6ee2655d47cd5
Merge: 6cd23b29d2 6c0f15500b
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:28 2021 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.3

2021-01-11 Thread nickm

commit 4b39f46a611ff48ceb7ea212dbcdb2e5b6d26d3b
Merge: 2e7cbd7a9c 6c0f15500b
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:28 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.3] Fix warnings in current debian-hardened CI.

2021-01-11 Thread nickm

commit ccdbbae4eceb8f6c508b67d53d6242961bf2e6eb
Author: Nick Mathewson 
Date:   Mon Jan 11 14:25:56 2021 -0500

Fix warnings in current debian-hardened CI.

We're getting "fallback annotation annotation in unreachable code"
warnings when we build with ALL_BUGS_ARE_FATAL. This patch fixes
that.

Fixes bug 40241.  Bugfix on 0.3.5.4-alpha.
---
 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/changes/40241 b/changes/40241
new file mode 100644
index 00..c9b2e2c011
--- /dev/null
+++ b/changes/40241
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+- Fix a compilation warning about unreachable fallthrough annotations
+  when building with "--enable-all-bugs-are-fatal" on some compilers.
+  Fixes bug 40241; bugfix on 0.3.5.4-alpha.
diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c
index 299ab88576..bdd82f3138 100644
--- a/src/core/or/channeltls.c
+++ b/src/core/or/channeltls.c
@@ -1225,8 +1225,9 @@ channel_tls_handle_var_cell(var_cell_t *var_cell, 
or_connection_t *conn)
* the v2 and v3 handshakes. */
   /* But that should be happening any longer've disabled bufferevents. */
   tor_assert_nonfatal_unreached_once();
-
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 case OR_CONN_STATE_TLS_SERVER_RENEGOTIATING:
   if (!(command_allowed_before_handshake(var_cell->command))) {
 log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c
index 03d495cdfd..83e2124498 100644
--- a/src/core/or/circuitlist.c
+++ b/src/core/or/circuitlist.c
@@ -787,7 +787,9 @@ circuit_purpose_to_controller_hs_state_string(uint8_t 
purpose)
  "Unrecognized circuit purpose: %d",
  (int)purpose);
   tor_fragile_assert();
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 
 case CIRCUIT_PURPOSE_OR:
 case CIRCUIT_PURPOSE_C_GENERAL:
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c
index 8d9230b66b..c930fe244f 100644
--- a/src/feature/client/entrynodes.c
+++ b/src/feature/client/entrynodes.c
@@ -2263,7 +2263,9 @@ entry_guards_note_guard_success(guard_selection_t *gs,
   break;
 default:
   tor_assert_nonfatal_unreached();
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 case GUARD_CIRC_STATE_USABLE_IF_NO_BETTER_GUARD:
   if (guard->is_primary) {
 /*  #20832 -- I don't actually like this logic. It seems to make
diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c
index 5c9dbea8e3..acff805c0e 100644
--- a/src/feature/rend/rendclient.c
+++ b/src/feature/rend/rendclient.c
@@ -819,7 +819,9 @@ rend_client_report_intro_point_failure(extend_info_t 
*failed_intro,
 log_warn(LD_BUG, "Unknown failure type %u. Removing intro point.",
  failure_type);
 tor_fragile_assert();
+#ifndef ALL_BUGS_ARE_FATAL
 FALLTHROUGH;
+#endif
   case INTRO_POINT_FAILURE_GENERIC:
 rend_cache_intro_failure_note(failure_type,
   (uint8_t *)failed_intro->identity_digest,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Merge branch 'ticket40241_035' into maint-0.3.5

2021-01-11 Thread nickm

commit 6c0f15500b3aa027c90d1c397d4504bb2f4dd41b
Merge: fcae26adf7 ccdbbae4ec
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:14 2021 -0500

Merge branch 'ticket40241_035' into maint-0.3.5

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Fix warnings in current debian-hardened CI.

2021-01-11 Thread nickm

commit ccdbbae4eceb8f6c508b67d53d6242961bf2e6eb
Author: Nick Mathewson 
Date:   Mon Jan 11 14:25:56 2021 -0500

Fix warnings in current debian-hardened CI.

We're getting "fallback annotation annotation in unreachable code"
warnings when we build with ALL_BUGS_ARE_FATAL. This patch fixes
that.

Fixes bug 40241.  Bugfix on 0.3.5.4-alpha.
---
 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/changes/40241 b/changes/40241
new file mode 100644
index 00..c9b2e2c011
--- /dev/null
+++ b/changes/40241
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+- Fix a compilation warning about unreachable fallthrough annotations
+  when building with "--enable-all-bugs-are-fatal" on some compilers.
+  Fixes bug 40241; bugfix on 0.3.5.4-alpha.
diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c
index 299ab88576..bdd82f3138 100644
--- a/src/core/or/channeltls.c
+++ b/src/core/or/channeltls.c
@@ -1225,8 +1225,9 @@ channel_tls_handle_var_cell(var_cell_t *var_cell, 
or_connection_t *conn)
* the v2 and v3 handshakes. */
   /* But that should be happening any longer've disabled bufferevents. */
   tor_assert_nonfatal_unreached_once();
-
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 case OR_CONN_STATE_TLS_SERVER_RENEGOTIATING:
   if (!(command_allowed_before_handshake(var_cell->command))) {
 log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c
index 03d495cdfd..83e2124498 100644
--- a/src/core/or/circuitlist.c
+++ b/src/core/or/circuitlist.c
@@ -787,7 +787,9 @@ circuit_purpose_to_controller_hs_state_string(uint8_t 
purpose)
  "Unrecognized circuit purpose: %d",
  (int)purpose);
   tor_fragile_assert();
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 
 case CIRCUIT_PURPOSE_OR:
 case CIRCUIT_PURPOSE_C_GENERAL:
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c
index 8d9230b66b..c930fe244f 100644
--- a/src/feature/client/entrynodes.c
+++ b/src/feature/client/entrynodes.c
@@ -2263,7 +2263,9 @@ entry_guards_note_guard_success(guard_selection_t *gs,
   break;
 default:
   tor_assert_nonfatal_unreached();
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 case GUARD_CIRC_STATE_USABLE_IF_NO_BETTER_GUARD:
   if (guard->is_primary) {
 /*  #20832 -- I don't actually like this logic. It seems to make
diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c
index 5c9dbea8e3..acff805c0e 100644
--- a/src/feature/rend/rendclient.c
+++ b/src/feature/rend/rendclient.c
@@ -819,7 +819,9 @@ rend_client_report_intro_point_failure(extend_info_t 
*failed_intro,
 log_warn(LD_BUG, "Unknown failure type %u. Removing intro point.",
  failure_type);
 tor_fragile_assert();
+#ifndef ALL_BUGS_ARE_FATAL
 FALLTHROUGH;
+#endif
   case INTRO_POINT_FAILURE_GENERIC:
 rend_cache_intro_failure_note(failure_type,
   (uint8_t *)failed_intro->identity_digest,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Increment version to 0.4.5.3-rc

2021-01-11 Thread nickm

commit edc9fda4f5ba6f1d04ec239e77aca273f8c6701b
Author: Nick Mathewson 
Date:   Mon Jan 11 12:48:00 2021 -0500

Increment version to 0.4.5.3-rc
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1c3fa7d15c..f74d8ec9db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.5.2-alpha-dev])
+AC_INIT([tor],[0.4.5.3-rc])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -16,7 +16,7 @@ configure_flags="$*"
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2020-11-23"], # for 0.4.5.2-alpha-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-01-11"], # for 0.4.5.3-rc
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index e541a81753..42af899563 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.5.2-alpha-dev"
+!define VERSION "0.4.5.3-rc"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 8b75a15ac6..c29c37c974 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.5.2-alpha-dev"
+#define VERSION "0.4.5.3-rc"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.5] Merge branch 'maint-0.4.3' into maint-0.4.4

2021-01-11 Thread nickm

commit 5a822b462aaa8cf3cd749c253bb1e9e5f4f37fa2
Merge: 77bb4b0838 4b39f46a61
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:29 2021 -0500

Merge branch 'maint-0.4.3' into maint-0.4.4

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

2021-01-11 Thread nickm

commit d31beeef9f5ce1e00079a106c60fc22b0451f5b9
Merge: ee0a27293e edc9fda4f5
Author: Nick Mathewson 
Date:   Mon Jan 11 12:48:11 2021 -0500

Merge branch 'maint-0.4.5'

"ours" to avoid version bump.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5

2021-01-11 Thread nickm

commit d1f474160638e10478a2ab14fb93b1e8b6a720a2
Merge: edc9fda4f5 5a822b462a
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:29 2021 -0500

Merge branch 'maint-0.4.4' into maint-0.4.5

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.3

2021-01-11 Thread nickm

commit 4b39f46a611ff48ceb7ea212dbcdb2e5b6d26d3b
Merge: 2e7cbd7a9c 6c0f15500b
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:28 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4

2021-01-11 Thread nickm

commit 5a822b462aaa8cf3cd749c253bb1e9e5f4f37fa2
Merge: 77bb4b0838 4b39f46a61
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:29 2021 -0500

Merge branch 'maint-0.4.3' into maint-0.4.4

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.5] Fix warnings in current debian-hardened CI.

2021-01-11 Thread nickm

commit ccdbbae4eceb8f6c508b67d53d6242961bf2e6eb
Author: Nick Mathewson 
Date:   Mon Jan 11 14:25:56 2021 -0500

Fix warnings in current debian-hardened CI.

We're getting "fallback annotation annotation in unreachable code"
warnings when we build with ALL_BUGS_ARE_FATAL. This patch fixes
that.

Fixes bug 40241.  Bugfix on 0.3.5.4-alpha.
---
 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/changes/40241 b/changes/40241
new file mode 100644
index 00..c9b2e2c011
--- /dev/null
+++ b/changes/40241
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+- Fix a compilation warning about unreachable fallthrough annotations
+  when building with "--enable-all-bugs-are-fatal" on some compilers.
+  Fixes bug 40241; bugfix on 0.3.5.4-alpha.
diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c
index 299ab88576..bdd82f3138 100644
--- a/src/core/or/channeltls.c
+++ b/src/core/or/channeltls.c
@@ -1225,8 +1225,9 @@ channel_tls_handle_var_cell(var_cell_t *var_cell, 
or_connection_t *conn)
* the v2 and v3 handshakes. */
   /* But that should be happening any longer've disabled bufferevents. */
   tor_assert_nonfatal_unreached_once();
-
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 case OR_CONN_STATE_TLS_SERVER_RENEGOTIATING:
   if (!(command_allowed_before_handshake(var_cell->command))) {
 log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c
index 03d495cdfd..83e2124498 100644
--- a/src/core/or/circuitlist.c
+++ b/src/core/or/circuitlist.c
@@ -787,7 +787,9 @@ circuit_purpose_to_controller_hs_state_string(uint8_t 
purpose)
  "Unrecognized circuit purpose: %d",
  (int)purpose);
   tor_fragile_assert();
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 
 case CIRCUIT_PURPOSE_OR:
 case CIRCUIT_PURPOSE_C_GENERAL:
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c
index 8d9230b66b..c930fe244f 100644
--- a/src/feature/client/entrynodes.c
+++ b/src/feature/client/entrynodes.c
@@ -2263,7 +2263,9 @@ entry_guards_note_guard_success(guard_selection_t *gs,
   break;
 default:
   tor_assert_nonfatal_unreached();
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 case GUARD_CIRC_STATE_USABLE_IF_NO_BETTER_GUARD:
   if (guard->is_primary) {
 /*  #20832 -- I don't actually like this logic. It seems to make
diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c
index 5c9dbea8e3..acff805c0e 100644
--- a/src/feature/rend/rendclient.c
+++ b/src/feature/rend/rendclient.c
@@ -819,7 +819,9 @@ rend_client_report_intro_point_failure(extend_info_t 
*failed_intro,
 log_warn(LD_BUG, "Unknown failure type %u. Removing intro point.",
  failure_type);
 tor_fragile_assert();
+#ifndef ALL_BUGS_ARE_FATAL
 FALLTHROUGH;
+#endif
   case INTRO_POINT_FAILURE_GENERIC:
 rend_cache_intro_failure_note(failure_type,
   (uint8_t *)failed_intro->identity_digest,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.5] Increment version to 0.4.5.3-rc

2021-01-11 Thread nickm

commit edc9fda4f5ba6f1d04ec239e77aca273f8c6701b
Author: Nick Mathewson 
Date:   Mon Jan 11 12:48:00 2021 -0500

Increment version to 0.4.5.3-rc
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1c3fa7d15c..f74d8ec9db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.5.2-alpha-dev])
+AC_INIT([tor],[0.4.5.3-rc])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -16,7 +16,7 @@ configure_flags="$*"
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2020-11-23"], # for 0.4.5.2-alpha-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-01-11"], # for 0.4.5.3-rc
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index e541a81753..42af899563 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.5.2-alpha-dev"
+!define VERSION "0.4.5.3-rc"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 8b75a15ac6..c29c37c974 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.5.2-alpha-dev"
+#define VERSION "0.4.5.3-rc"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.5] Merge branch 'ticket40241_035' into maint-0.3.5

2021-01-11 Thread nickm

commit 6c0f15500b3aa027c90d1c397d4504bb2f4dd41b
Merge: fcae26adf7 ccdbbae4ec
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:14 2021 -0500

Merge branch 'ticket40241_035' into maint-0.3.5

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

2021-01-11 Thread nickm

commit 4b39f46a611ff48ceb7ea212dbcdb2e5b6d26d3b
Merge: 2e7cbd7a9c 6c0f15500b
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:28 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.4] Fix warnings in current debian-hardened CI.

2021-01-11 Thread nickm

commit ccdbbae4eceb8f6c508b67d53d6242961bf2e6eb
Author: Nick Mathewson 
Date:   Mon Jan 11 14:25:56 2021 -0500

Fix warnings in current debian-hardened CI.

We're getting "fallback annotation annotation in unreachable code"
warnings when we build with ALL_BUGS_ARE_FATAL. This patch fixes
that.

Fixes bug 40241.  Bugfix on 0.3.5.4-alpha.
---
 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/changes/40241 b/changes/40241
new file mode 100644
index 00..c9b2e2c011
--- /dev/null
+++ b/changes/40241
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+- Fix a compilation warning about unreachable fallthrough annotations
+  when building with "--enable-all-bugs-are-fatal" on some compilers.
+  Fixes bug 40241; bugfix on 0.3.5.4-alpha.
diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c
index 299ab88576..bdd82f3138 100644
--- a/src/core/or/channeltls.c
+++ b/src/core/or/channeltls.c
@@ -1225,8 +1225,9 @@ channel_tls_handle_var_cell(var_cell_t *var_cell, 
or_connection_t *conn)
* the v2 and v3 handshakes. */
   /* But that should be happening any longer've disabled bufferevents. */
   tor_assert_nonfatal_unreached_once();
-
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 case OR_CONN_STATE_TLS_SERVER_RENEGOTIATING:
   if (!(command_allowed_before_handshake(var_cell->command))) {
 log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c
index 03d495cdfd..83e2124498 100644
--- a/src/core/or/circuitlist.c
+++ b/src/core/or/circuitlist.c
@@ -787,7 +787,9 @@ circuit_purpose_to_controller_hs_state_string(uint8_t 
purpose)
  "Unrecognized circuit purpose: %d",
  (int)purpose);
   tor_fragile_assert();
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 
 case CIRCUIT_PURPOSE_OR:
 case CIRCUIT_PURPOSE_C_GENERAL:
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c
index 8d9230b66b..c930fe244f 100644
--- a/src/feature/client/entrynodes.c
+++ b/src/feature/client/entrynodes.c
@@ -2263,7 +2263,9 @@ entry_guards_note_guard_success(guard_selection_t *gs,
   break;
 default:
   tor_assert_nonfatal_unreached();
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 case GUARD_CIRC_STATE_USABLE_IF_NO_BETTER_GUARD:
   if (guard->is_primary) {
 /*  #20832 -- I don't actually like this logic. It seems to make
diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c
index 5c9dbea8e3..acff805c0e 100644
--- a/src/feature/rend/rendclient.c
+++ b/src/feature/rend/rendclient.c
@@ -819,7 +819,9 @@ rend_client_report_intro_point_failure(extend_info_t 
*failed_intro,
 log_warn(LD_BUG, "Unknown failure type %u. Removing intro point.",
  failure_type);
 tor_fragile_assert();
+#ifndef ALL_BUGS_ARE_FATAL
 FALLTHROUGH;
+#endif
   case INTRO_POINT_FAILURE_GENERIC:
 rend_cache_intro_failure_note(failure_type,
   (uint8_t *)failed_intro->identity_digest,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.4] Merge branch 'ticket40241_035' into maint-0.3.5

2021-01-11 Thread nickm

commit 6c0f15500b3aa027c90d1c397d4504bb2f4dd41b
Merge: fcae26adf7 ccdbbae4ec
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:14 2021 -0500

Merge branch 'ticket40241_035' into maint-0.3.5

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.3] Fix warnings in current debian-hardened CI.

2021-01-11 Thread nickm

commit ccdbbae4eceb8f6c508b67d53d6242961bf2e6eb
Author: Nick Mathewson 
Date:   Mon Jan 11 14:25:56 2021 -0500

Fix warnings in current debian-hardened CI.

We're getting "fallback annotation annotation in unreachable code"
warnings when we build with ALL_BUGS_ARE_FATAL. This patch fixes
that.

Fixes bug 40241.  Bugfix on 0.3.5.4-alpha.
---
 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/changes/40241 b/changes/40241
new file mode 100644
index 00..c9b2e2c011
--- /dev/null
+++ b/changes/40241
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+- Fix a compilation warning about unreachable fallthrough annotations
+  when building with "--enable-all-bugs-are-fatal" on some compilers.
+  Fixes bug 40241; bugfix on 0.3.5.4-alpha.
diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c
index 299ab88576..bdd82f3138 100644
--- a/src/core/or/channeltls.c
+++ b/src/core/or/channeltls.c
@@ -1225,8 +1225,9 @@ channel_tls_handle_var_cell(var_cell_t *var_cell, 
or_connection_t *conn)
* the v2 and v3 handshakes. */
   /* But that should be happening any longer've disabled bufferevents. */
   tor_assert_nonfatal_unreached_once();
-
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 case OR_CONN_STATE_TLS_SERVER_RENEGOTIATING:
   if (!(command_allowed_before_handshake(var_cell->command))) {
 log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c
index 03d495cdfd..83e2124498 100644
--- a/src/core/or/circuitlist.c
+++ b/src/core/or/circuitlist.c
@@ -787,7 +787,9 @@ circuit_purpose_to_controller_hs_state_string(uint8_t 
purpose)
  "Unrecognized circuit purpose: %d",
  (int)purpose);
   tor_fragile_assert();
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 
 case CIRCUIT_PURPOSE_OR:
 case CIRCUIT_PURPOSE_C_GENERAL:
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c
index 8d9230b66b..c930fe244f 100644
--- a/src/feature/client/entrynodes.c
+++ b/src/feature/client/entrynodes.c
@@ -2263,7 +2263,9 @@ entry_guards_note_guard_success(guard_selection_t *gs,
   break;
 default:
   tor_assert_nonfatal_unreached();
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 case GUARD_CIRC_STATE_USABLE_IF_NO_BETTER_GUARD:
   if (guard->is_primary) {
 /*  #20832 -- I don't actually like this logic. It seems to make
diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c
index 5c9dbea8e3..acff805c0e 100644
--- a/src/feature/rend/rendclient.c
+++ b/src/feature/rend/rendclient.c
@@ -819,7 +819,9 @@ rend_client_report_intro_point_failure(extend_info_t 
*failed_intro,
 log_warn(LD_BUG, "Unknown failure type %u. Removing intro point.",
  failure_type);
 tor_fragile_assert();
+#ifndef ALL_BUGS_ARE_FATAL
 FALLTHROUGH;
+#endif
   case INTRO_POINT_FAILURE_GENERIC:
 rend_cache_intro_failure_note(failure_type,
   (uint8_t *)failed_intro->identity_digest,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.3

2021-01-11 Thread nickm

commit 4b39f46a611ff48ceb7ea212dbcdb2e5b6d26d3b
Merge: 2e7cbd7a9c 6c0f15500b
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:28 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.3] Merge branch 'ticket40241_035' into maint-0.3.5

2021-01-11 Thread nickm

commit 6c0f15500b3aa027c90d1c397d4504bb2f4dd41b
Merge: fcae26adf7 ccdbbae4ec
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:14 2021 -0500

Merge branch 'ticket40241_035' into maint-0.3.5

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.5] Merge branch 'ticket40241_035' into maint-0.3.5

2021-01-11 Thread nickm

commit 6c0f15500b3aa027c90d1c397d4504bb2f4dd41b
Merge: fcae26adf7 ccdbbae4ec
Author: Nick Mathewson 
Date:   Mon Jan 11 14:37:14 2021 -0500

Merge branch 'ticket40241_035' into maint-0.3.5

 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.5] Fix warnings in current debian-hardened CI.

2021-01-11 Thread nickm

commit ccdbbae4eceb8f6c508b67d53d6242961bf2e6eb
Author: Nick Mathewson 
Date:   Mon Jan 11 14:25:56 2021 -0500

Fix warnings in current debian-hardened CI.

We're getting "fallback annotation annotation in unreachable code"
warnings when we build with ALL_BUGS_ARE_FATAL. This patch fixes
that.

Fixes bug 40241.  Bugfix on 0.3.5.4-alpha.
---
 changes/40241   | 4 
 src/core/or/channeltls.c| 3 ++-
 src/core/or/circuitlist.c   | 2 ++
 src/feature/client/entrynodes.c | 2 ++
 src/feature/rend/rendclient.c   | 2 ++
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/changes/40241 b/changes/40241
new file mode 100644
index 00..c9b2e2c011
--- /dev/null
+++ b/changes/40241
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+- Fix a compilation warning about unreachable fallthrough annotations
+  when building with "--enable-all-bugs-are-fatal" on some compilers.
+  Fixes bug 40241; bugfix on 0.3.5.4-alpha.
diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c
index 299ab88576..bdd82f3138 100644
--- a/src/core/or/channeltls.c
+++ b/src/core/or/channeltls.c
@@ -1225,8 +1225,9 @@ channel_tls_handle_var_cell(var_cell_t *var_cell, 
or_connection_t *conn)
* the v2 and v3 handshakes. */
   /* But that should be happening any longer've disabled bufferevents. */
   tor_assert_nonfatal_unreached_once();
-
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 case OR_CONN_STATE_TLS_SERVER_RENEGOTIATING:
   if (!(command_allowed_before_handshake(var_cell->command))) {
 log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c
index 03d495cdfd..83e2124498 100644
--- a/src/core/or/circuitlist.c
+++ b/src/core/or/circuitlist.c
@@ -787,7 +787,9 @@ circuit_purpose_to_controller_hs_state_string(uint8_t 
purpose)
  "Unrecognized circuit purpose: %d",
  (int)purpose);
   tor_fragile_assert();
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 
 case CIRCUIT_PURPOSE_OR:
 case CIRCUIT_PURPOSE_C_GENERAL:
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c
index 8d9230b66b..c930fe244f 100644
--- a/src/feature/client/entrynodes.c
+++ b/src/feature/client/entrynodes.c
@@ -2263,7 +2263,9 @@ entry_guards_note_guard_success(guard_selection_t *gs,
   break;
 default:
   tor_assert_nonfatal_unreached();
+#ifndef ALL_BUGS_ARE_FATAL
   FALLTHROUGH;
+#endif
 case GUARD_CIRC_STATE_USABLE_IF_NO_BETTER_GUARD:
   if (guard->is_primary) {
 /*  #20832 -- I don't actually like this logic. It seems to make
diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c
index 5c9dbea8e3..acff805c0e 100644
--- a/src/feature/rend/rendclient.c
+++ b/src/feature/rend/rendclient.c
@@ -819,7 +819,9 @@ rend_client_report_intro_point_failure(extend_info_t 
*failed_intro,
 log_warn(LD_BUG, "Unknown failure type %u. Removing intro point.",
  failure_type);
 tor_fragile_assert();
+#ifndef ALL_BUGS_ARE_FATAL
 FALLTHROUGH;
+#endif
   case INTRO_POINT_FAILURE_GENERIC:
 rend_cache_intro_failure_note(failure_type,
   (uint8_t *)failed_intro->identity_digest,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb

2021-01-11 Thread translation

commit 7a8e7d9111caa970d99ecdb4987382f2641c2ca7
Author: Translation commit bot 
Date:   Mon Jan 11 19:15:07 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
---
 fr/LC_MESSAGES/bridgedb.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po
index 57616ff062..f7f36ccec5 100644
--- a/fr/LC_MESSAGES/bridgedb.po
+++ b/fr/LC_MESSAGES/bridgedb.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# AO , 2018-2020
+# AO , 2018-2021
 # apaddlingduck, 2014
 # Boubou , 2015
 # Cryptie , 2014
@@ -12,7 +12,7 @@
 # AO , 2017-2018
 # AO , 2016-2017
 # Frisson Reynald , 2014
-# hpatte, 2014
+# 9c0dfc95f4cd74427a954d3bb24cbf11_3e36064, 2014
 # Lucas Leroy , 2014
 # Lunar , 2013
 # Onizuka, 2013
@@ -30,7 +30,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2020-05-14 14:21-0700\n"
-"PO-Revision-Date: 2020-05-15 14:55+\n"
+"PO-Revision-Date: 2021-01-11 18:46+\n"
 "Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -165,7 +165,7 @@ msgstr "Maintenant, %s ajoutez les ponts au NavigateurÂ Tor 
%s"
 #: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
-msgstr "Donnez-moi %sj%suste des pontsâ!"
+msgstr "Donnez-moi %sj%suste des ponts"
 
 #: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed

2021-01-11 Thread translation

commit 09393b1ff363aa88475836ed0fad666ff04664e3
Author: Translation commit bot 
Date:   Mon Jan 11 19:15:09 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
---
 fr/LC_MESSAGES/bridgedb.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po
index 57616ff062..f7f36ccec5 100644
--- a/fr/LC_MESSAGES/bridgedb.po
+++ b/fr/LC_MESSAGES/bridgedb.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
-# AO , 2018-2020
+# AO , 2018-2021
 # apaddlingduck, 2014
 # Boubou , 2015
 # Cryptie , 2014
@@ -12,7 +12,7 @@
 # AO , 2017-2018
 # AO , 2016-2017
 # Frisson Reynald , 2014
-# hpatte, 2014
+# 9c0dfc95f4cd74427a954d3bb24cbf11_3e36064, 2014
 # Lucas Leroy , 2014
 # Lunar , 2013
 # Onizuka, 2013
@@ -30,7 +30,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2020-05-14 14:21-0700\n"
-"PO-Revision-Date: 2020-05-15 14:55+\n"
+"PO-Revision-Date: 2021-01-11 18:46+\n"
 "Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -165,7 +165,7 @@ msgstr "Maintenant, %s ajoutez les ponts au NavigateurÂ Tor 
%s"
 #: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
-msgstr "Donnez-moi %sj%suste des pontsâ!"
+msgstr "Donnez-moi %sj%suste des ponts"
 
 #: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.5] Run format_changelog.py

2021-01-11 Thread nickm

commit 5c13a921409403943f87d390b996eda855891415
Author: Nick Mathewson 
Date:   Mon Jan 11 12:51:46 2021 -0500

Run format_changelog.py
---
 ChangeLog | 72 ---
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 910e6c1d44..e883b8b6af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,56 +1,58 @@
 Changes in version 0.4.5.3-rc - 2021-01-12
-  Tor 0.4.5.3-rc is the first release candidate in its series.  It fixes
-  several bugs, including one that broke onion services on certain older ARM
-  CPUs.
+  Tor 0.4.5.3-rc is the first release candidate in its series. It fixes
+  several bugs, including one that broke onion services on certain older
+  ARM CPUs.
 
-  Though we anticipate that we'll be doing a bit more clean-up between now
-  and the stable release, we expect that our remaining changes will be fairly
-  simple.  There will be at lease one more release candidate before 0.4.5.x
-  is stable.
+  Though we anticipate that we'll be doing a bit more clean-up between
+  now and the stable release, we expect that our remaining changes will
+  be fairly simple. There will be at lease one more release candidate
+  before 0.4.5.x is stable.
 
   o Minor features (crypto):
-- Fix undefined behavior on our Keccak library. The bug only appears on
-  platforms with 32-byte CPU cache lines (e.g. armv5tel) and would result
-  in wrong digests. Fixes bug 40210; bugfix on 0.2.8.1-alpha. Thanks to
-  Bernhard Ãbelacker, Arnd Bergmann and weasel for diagnosing this.
+- Fix undefined behavior on our Keccak library. The bug only appears
+  on platforms with 32-byte CPU cache lines (e.g. armv5tel) and
+  would result in wrong digests. Fixes bug 40210; bugfix on
+  0.2.8.1-alpha. Thanks to Bernhard Ãbelacker, Arnd Bergmann and
+  weasel for diagnosing this.
 
   o Minor features (documentation):
 - Mention the !badexit directive that can appear in an authority's
   approved-routers file, and update the description of the !invalid
   directive. Closes ticket 40188.
 
-  o Minor bugfixes (config, bridge):
-- Really fix the case where torrc has a missing ClientTransportPlugin but
-  configured with a Bridge line and UseBridges. Previously, we failed to
-  also look at the managed proxy list and thus it would fail for the
-  "exec" case. Fixes bug 40106; bugfix on 0.4.5.1-alpha.
-
   o Minor bugfixes (build):
-- Fix the --enable-static-tor switch to properly set the -static compile
-  option onto the tor binary only. Fixes bug 40111; bugfix on
-  0.2.3.1-alpha.
+- Fix the --enable-static-tor switch to properly set the -static
+  compile option onto the tor binary only. Fixes bug 40111; bugfix
+  on 0.2.3.1-alpha.
 - Path to static libevent has been fixed as well which affects the
-  --enable-static-libevent to behave correctly now. The .a file is in
-  .libs/ of libevent repository, not at the root.
+  --enable-static-libevent to behave correctly now. The .a file is
+  in .libs/ of libevent repository, not at the root.
+
+  o Minor bugfixes (config, bridge):
+- Really fix the case where torrc has a missing ClientTransportPlugin
+  but configured with a Bridge line and UseBridges. Previously, we
+  failed to also look at the managed proxy list and thus it would
+  fail for the "exec" case. Fixes bug 40106; bugfix on 0.4.5.1-alpha.
 
   o Minor bugfixes (logging, relay):
-- Logs the address discovered by the directory authorities if none were
-  configured or detected before. Fixes bug 40201; bugfix on 0.4.5.1-alpha.
-- When launching bandwidth testing circuit, don't log notice that we are
-  doing a reachability test. Furthermore, avoid to trigger a
-  "CHECKING_REACHABILITY" control event. Fixes bug 40205; bugfix on
-  0.4.5.1-alpha.
+- Logs the address discovered by the directory authorities if none
+  were configured or detected before. Fixes bug 40201; bugfix
+  on 0.4.5.1-alpha.
+- When launching bandwidth testing circuit, don't log notice that we
+  are doing a reachability test. Furthermore, avoid to trigger a
+  "CHECKING_REACHABILITY" control event. Fixes bug 40205; bugfix
+  on 0.4.5.1-alpha.
 
   o Minor bugfixes (relay, statistics):
-- The connection statistics were wrongly exported in the extrainfo document
-  due to a problem in the file loading function which would wrongly 
truncate
-  the file reporting the wrong information. It is now fixed. Fixes bug
-  40226; bugfix on 0.4.5.1-alpha.
+- The connection statistics were wrongly exported in the extrainfo
+  document due to a problem in the file loading function which would
+  wrongly truncate the file reporting the wrong information. It is
+  now fixed. Fixes bug 40226; bugfix on 0.4.5.1-alpha.
 
   o Minor bugfixes (SOCKS5):
-- Handle partial socks5

[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5

2021-01-11 Thread nickm

commit 9ad7906f41f184fbbd064d71eea59ad52583892a
Merge: f44c12a708 edc9fda4f5
Author: Nick Mathewson 
Date:   Mon Jan 11 12:48:25 2021 -0500

Merge branch 'maint-0.4.5' into release-0.4.5

 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.5] Small edits to changelog

2021-01-11 Thread nickm

commit d4253bbea02ba7da20308ea93d0666cca647930e
Author: Nick Mathewson 
Date:   Mon Jan 11 12:55:28 2021 -0500

Small edits to changelog
---
 ChangeLog | 45 +
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e883b8b6af..961ac14eba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,49 +9,46 @@ Changes in version 0.4.5.3-rc - 2021-01-12
   before 0.4.5.x is stable.
 
   o Minor features (crypto):
-- Fix undefined behavior on our Keccak library. The bug only appears
-  on platforms with 32-byte CPU cache lines (e.g. armv5tel) and
-  would result in wrong digests. Fixes bug 40210; bugfix on
+- Fix undefined behavior on our Keccak library. The bug only
+  appeared on platforms with 32-byte CPU cache lines (e.g. armv5tel)
+  and would result in wrong digests. Fixes bug 40210; bugfix on
   0.2.8.1-alpha. Thanks to Bernhard Ãbelacker, Arnd Bergmann and
   weasel for diagnosing this.
 
   o Minor features (documentation):
-- Mention the !badexit directive that can appear in an authority's
-  approved-routers file, and update the description of the !invalid
-  directive. Closes ticket 40188.
+- Mention that the "!badexit" directive that can appear in an
+  authority's approved-routers file, and update the description of
+  the "!invalid" directive. Closes ticket 40188.
 
   o Minor bugfixes (build):
-- Fix the --enable-static-tor switch to properly set the -static
+- Fix the "--enable-static-tor" switch to properly set the "-static"
   compile option onto the tor binary only. Fixes bug 40111; bugfix
   on 0.2.3.1-alpha.
-- Path to static libevent has been fixed as well which affects the
-  --enable-static-libevent to behave correctly now. The .a file is
-  in .libs/ of libevent repository, not at the root.
 
   o Minor bugfixes (config, bridge):
 - Really fix the case where torrc has a missing ClientTransportPlugin
   but configured with a Bridge line and UseBridges. Previously, we
-  failed to also look at the managed proxy list and thus it would
-  fail for the "exec" case. Fixes bug 40106; bugfix on 0.4.5.1-alpha.
+  didn't look at the managed proxy list and thus would fail for the
+  "exec" case. Fixes bug 40106; bugfix on 0.4.5.1-alpha.
 
   o Minor bugfixes (logging, relay):
-- Logs the address discovered by the directory authorities if none
-  were configured or detected before. Fixes bug 40201; bugfix
-  on 0.4.5.1-alpha.
-- When launching bandwidth testing circuit, don't log notice that we
-  are doing a reachability test. Furthermore, avoid to trigger a
-  "CHECKING_REACHABILITY" control event. Fixes bug 40205; bugfix
+- Log our address as reported by the directory authorities, if none
+  was configured or detected before. Fixes bug 40201; bugfix
   on 0.4.5.1-alpha.
+- When a launching bandwidth testing circuit, don't incorrectly call
+  it a reachability test, or trigger a "CHECKING_REACHABILITY"
+  control event. Fixes bug 40205; bugfix on 0.4.5.1-alpha.
 
   o Minor bugfixes (relay, statistics):
-- The connection statistics were wrongly exported in the extrainfo
-  document due to a problem in the file loading function which would
-  wrongly truncate the file reporting the wrong information. It is
-  now fixed. Fixes bug 40226; bugfix on 0.4.5.1-alpha.
+- Report the correct connection statistics in our extrainfo
+  documents. Previously there was a problem in the file loading
+  function which would wrongly truncate a state file, causing the
+  wrong information to be reported. Fixes bug 40226; bugfix
+  on 0.4.5.1-alpha.
 
   o Minor bugfixes (SOCKS5):
-- Handle partial socks5 messages correctly. Previously, our code
-  would send an incorrect error message if it got a socks5 request
+- Handle partial SOCKS5 messages correctly. Previously, our code
+  would send an incorrect error message if it got a SOCKS5 request
   that wasn't complete. Fixes bug 40190; bugfix on 0.3.5.1-alpha.
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.5] Increment version to 0.4.5.3-rc

2021-01-11 Thread nickm

commit edc9fda4f5ba6f1d04ec239e77aca273f8c6701b
Author: Nick Mathewson 
Date:   Mon Jan 11 12:48:00 2021 -0500

Increment version to 0.4.5.3-rc
---
 configure.ac| 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1c3fa7d15c..f74d8ec9db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.5.2-alpha-dev])
+AC_INIT([tor],[0.4.5.3-rc])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -16,7 +16,7 @@ configure_flags="$*"
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2020-11-23"], # for 0.4.5.2-alpha-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-01-11"], # for 0.4.5.3-rc
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index e541a81753..42af899563 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.5.2-alpha-dev"
+!define VERSION "0.4.5.3-rc"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 8b75a15ac6..c29c37c974 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.5.2-alpha-dev"
+#define VERSION "0.4.5.3-rc"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.5] Start a changelog for 0.4.5.3-rc

2021-01-11 Thread nickm

commit 2e2c3795ad448d40e2f3f241090b5c73c30a21af
Author: Nick Mathewson 
Date:   Mon Jan 11 12:51:26 2021 -0500

Start a changelog for 0.4.5.3-rc
---
 ChangeLog   | 55 +
 changes/bug40190|  4 
 changes/bug40210|  5 -
 changes/ticket40106 |  5 -
 changes/ticket40111 |  7 ---
 changes/ticket40188 |  4 
 changes/ticket40201 |  3 ---
 changes/ticket40205 |  5 -
 changes/ticket40226 |  5 -
 9 files changed, 55 insertions(+), 38 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 62e00c17c8..910e6c1d44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,58 @@
+Changes in version 0.4.5.3-rc - 2021-01-12
+  Tor 0.4.5.3-rc is the first release candidate in its series.  It fixes
+  several bugs, including one that broke onion services on certain older ARM
+  CPUs.
+
+  Though we anticipate that we'll be doing a bit more clean-up between now
+  and the stable release, we expect that our remaining changes will be fairly
+  simple.  There will be at lease one more release candidate before 0.4.5.x
+  is stable.
+
+  o Minor features (crypto):
+- Fix undefined behavior on our Keccak library. The bug only appears on
+  platforms with 32-byte CPU cache lines (e.g. armv5tel) and would result
+  in wrong digests. Fixes bug 40210; bugfix on 0.2.8.1-alpha. Thanks to
+  Bernhard Ãbelacker, Arnd Bergmann and weasel for diagnosing this.
+
+  o Minor features (documentation):
+- Mention the !badexit directive that can appear in an authority's
+  approved-routers file, and update the description of the !invalid
+  directive. Closes ticket 40188.
+
+  o Minor bugfixes (config, bridge):
+- Really fix the case where torrc has a missing ClientTransportPlugin but
+  configured with a Bridge line and UseBridges. Previously, we failed to
+  also look at the managed proxy list and thus it would fail for the
+  "exec" case. Fixes bug 40106; bugfix on 0.4.5.1-alpha.
+
+  o Minor bugfixes (build):
+- Fix the --enable-static-tor switch to properly set the -static compile
+  option onto the tor binary only. Fixes bug 40111; bugfix on
+  0.2.3.1-alpha.
+- Path to static libevent has been fixed as well which affects the
+  --enable-static-libevent to behave correctly now. The .a file is in
+  .libs/ of libevent repository, not at the root.
+
+  o Minor bugfixes (logging, relay):
+- Logs the address discovered by the directory authorities if none were
+  configured or detected before. Fixes bug 40201; bugfix on 0.4.5.1-alpha.
+- When launching bandwidth testing circuit, don't log notice that we are
+  doing a reachability test. Furthermore, avoid to trigger a
+  "CHECKING_REACHABILITY" control event. Fixes bug 40205; bugfix on
+  0.4.5.1-alpha.
+
+  o Minor bugfixes (relay, statistics):
+- The connection statistics were wrongly exported in the extrainfo document
+  due to a problem in the file loading function which would wrongly 
truncate
+  the file reporting the wrong information. It is now fixed. Fixes bug
+  40226; bugfix on 0.4.5.1-alpha.
+
+  o Minor bugfixes (SOCKS5):
+- Handle partial socks5 messages correctly.  Previously, our code would
+  send an incorrect error message if it got a socks5 request that wasn't
+  complete. Fixes bug 40190; bugfix on 0.3.5.1-alpha.
+
+
 Changes in version 0.4.5.2-alpha - 2020-11-23
   Tor 0.4.5.2-alpha is the second alpha release in the 0.4.5.x series.
   It fixes several bugs present in earlier releases, including one that
diff --git a/changes/bug40190 b/changes/bug40190
deleted file mode 100644
index 0f3d6941dc..00
--- a/changes/bug40190
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (SOCKS5):
-- Handle partial socks5 messages correctly.  Previously, our code would
-  send an incorrect error message if it got a socks5 request that wasn't
-  complete. Fixes bug 40190; bugfix on 0.3.5.1-alpha.
diff --git a/changes/bug40210 b/changes/bug40210
deleted file mode 100644
index f492262a11..00
--- a/changes/bug40210
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor features (crypto):
-- Fix undefined behavior on our Keccak library. The bug only appears on
-  platforms with 32-byte CPU cache lines (e.g. armv5tel) and would result
-  in wrong digests. Fixes bug 40210; bugfix on 0.2.8.1-alpha. Thanks to
-  Bernhard Ãbelacker, Arnd Bergmann and weasel for diagnosing this.
diff --git a/changes/ticket40106 b/changes/ticket40106
deleted file mode 100644
index d007cf535e..00
--- a/changes/ticket40106
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (config, bridge):
-- Really fix the case where torrc has a missing ClientTransportPlugin but
-  configured with a Bridge line and UseBridges. Previously, we failed to
-  also look at the managed proxy list and thus it would fail for the
-  "exec" case. Fixes bug 40106; bugfix on 0.4.5.1-alpha.

[tor-commits] [chutney/master] Change extension of README so markdown can be rendered in the repository in gitlab.

2021-01-11 Thread nickm

commit 6482896b1fc8441f4f3b4d8232bf0c842d5ed29c
Author: Gaba 
Date:   Tue Dec 22 09:00:31 2020 -0300

Change extension of README so markdown can be rendered in the repository in 
gitlab.
---
 README => README.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/README b/README.md
similarity index 100%
rename from README
rename to README.md



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [chutney/master] Adds issue creation templates for bugs, features, proposals and documentation.

2021-01-11 Thread nickm

commit 8dcad9dd6a952df05cfd9ed56aaca369d2d99a3c
Author: Gaba 
Date:   Tue Dec 22 09:00:51 2020 -0300

Adds issue creation templates for bugs, features, proposals and 
documentation.
---
 .gitlab/issue_templates/bug.md   | 42 
 .gitlab/issue_templates/documentation.md | 35 ++
 .gitlab/issue_templates/feature.md   | 15 
 .gitlab/issue_templates/proposal.md  |  5 
 4 files changed, 97 insertions(+)

diff --git a/.gitlab/issue_templates/bug.md b/.gitlab/issue_templates/bug.md
new file mode 100644
index 000..d27dea5
--- /dev/null
+++ b/.gitlab/issue_templates/bug.md
@@ -0,0 +1,42 @@
+
+
+### Summary
+
+
+
+### Steps to reproduce:
+
+1. step 1
+2. step 2
+3. ...
+
+### What is the current bug behavior?
+
+
+
+### What is the expected behavior?
+
+
+
+### Environment
+
+
+
+- Version: e.g. 0.10, output of --version (without backslashes)
+- Operating system: Debian GNU/Linux 9.1 (stretch), Windows 7, Ubuntu Xenial, 
etc
+- Install method: distribution package, from source tarball, from git, etc
+- etc...
+
+### Relevant logs and/or screenshots:
+
+
+
+### Possible fixes:
+
+
+
+/label ~bug
diff --git a/.gitlab/issue_templates/documentation.md 
b/.gitlab/issue_templates/documentation.md
new file mode 100644
index 000..6f0d4b4
--- /dev/null
+++ b/.gitlab/issue_templates/documentation.md
@@ -0,0 +1,35 @@
+
+
+### Problem to solve
+
+
+
+* What feature(s) affected?
+* What docs or doc section affected? Include links or paths.
+* Is there a problem with a specific document, or a feature/process that's not 
addressed sufficiently in docs?
+* Any other ideas or requests?
+
+
+### Further details
+
+
+
+### Proposal
+
+
+
+### Who can address the issue
+
+
+
+### Other links/references
+
+
+
+/label ~documentation
diff --git a/.gitlab/issue_templates/feature.md 
b/.gitlab/issue_templates/feature.md
new file mode 100644
index 000..f0c3f1b
--- /dev/null
+++ b/.gitlab/issue_templates/feature.md
@@ -0,0 +1,15 @@
+
+
+### Summary
+
+
+
+### What is the expected behavior?
+
+
+
+
+
+/label ~Feature
diff --git a/.gitlab/issue_templates/proposal.md 
b/.gitlab/issue_templates/proposal.md
new file mode 100644
index 000..990ca70
--- /dev/null
+++ b/.gitlab/issue_templates/proposal.md
@@ -0,0 +1,5 @@
+
+
+### Proposal
+
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

2021-01-11 Thread translation

commit 66fbc4b3dd2438d984e7b14bfb4c8ac3096f
Author: Translation commit bot 
Date:   Mon Jan 11 17:17:09 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+el.po | 36 +++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/contents+el.po b/contents+el.po
index 455231c846..ac00b9075b 100644
--- a/contents+el.po
+++ b/contents+el.po
@@ -970,6 +970,8 @@ msgid ""
 "Read the [Bridges](../bridges/) section to learn what bridges are and how to"
 " obtain them."
 msgstr ""
+"ÎÎ¹Î±Î²Î¬ÏÏÎµ ÏÎ·Î½ ÎµÎ½ÏÏÎ·ÏÎ± [ÎÎÏÏÏÎµÏ](../bridges/) Î³Î¹Î± 
Î½Î± Î¼Î¬Î¸ÎµÏÎµ ÏÎ¹ ÎµÎ¯Î½Î±Î¹ Î¿Î¹ "
+"Î³ÎÏÏÏÎµÏ ÎºÎ±Î¹ ÏÏÏ Î½Î± ÏÎ¹Ï Î±Î½Î±ÎºÏÎ®ÏÎµÏÎµ."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.title)
@@ -1082,6 +1084,8 @@ msgid ""
 "If you're starting Tor Browser for the first time, click \"Configure\" to "
 "open the Tor Network Settings window."
 msgstr ""
+"ÎÎ½ ÎµÎºÎºÎ¹Î½ÎµÎ¯ÏÎµ ÏÎ¿Î½ Tor browser Î³Î¹Î± ÏÏÏÏÎ· ÏÎ¿ÏÎ¬, 
ÏÎ±ÏÎ®ÏÏÎµ Â«Î¡ÏÎ¸Î¼Î¯ÏÎµÎ¹ÏÂ» Î³Î¹Î± Î½Î± "
+"Î±Î½Î¿Î¯Î¾ÎµÏÎµ ÏÎ¿ ÏÎ±ÏÎ¬Î¸ÏÏÎ¿ Î¡ÏÎ¸Î¼Î¯ÏÎµÎ¹Ï ÎÎ¹ÎºÏÏÎ¿Ï Tor."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -1090,6 +1094,9 @@ msgid ""
 "\"Request a bridge from torproject.org\" and click \"Request a Bridge...\" "
 "for BridgeDB to provide a bridge."
 msgstr ""
+"ÎÏÎ¿Ï ÎµÏÎ¹Î»ÎÎ¾ÎµÏÎµ ÏÎ¿ ÏÎµÏÏÎ¬Î³ÏÎ½Î¿ Â«Î¤Î¿ Tor 
Î»Î¿Î³Î¿ÎºÏÎ¯Î½ÎµÏÎ±Î¹ ÏÏÎ·Î½ ÏÏÏÎ± Î¼Î¿ÏÂ», ÎµÏÎ¹Î»ÎÎ¾ÏÎµ "
+"Â«ÎÎ·ÏÎµÎ¯ÏÏÎµ Î¼Î¹Î± Î³ÎÏÏÏÎ± Î±ÏÏ ÏÎ¿ torproject.orgÂ» ÎºÎ±Î¹ 
ÏÎ±ÏÎ®ÏÏÎµ Â«ÎÎ·ÏÎµÎ¯ÏÏÎµ Î¼Î¹Î± "
+"ÎÎÏÏÏÎ±...Â» ÏÏÏÎµ ÏÎ¿ BridgeDB Î½Î± ÏÎ±Ï ÏÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹ 
Î¼Î¹Î± Î³ÎÏÏÏÎ±."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -1097,6 +1104,8 @@ msgid ""
 "Complete the CAPTCHA and click \"Submit.\" Click \"Connect\" to save your "
 "settings."
 msgstr ""
+"Î£ÏÎ¼ÏÎ»Î·ÏÏÏÏÎµ ÏÎ¿ CAPTCHA ÎºÎ±Î¹ ÏÎ±ÏÎ®ÏÏÎµ Â«Î¥ÏÎ¿Î²Î¿Î»Î®Â». 
Î Î±ÏÎ®ÏÏÎµ Â«Î£ÏÎ½Î´ÎµÏÎ·Â» Î³Î¹Î± Î½Î± "
+"Î±ÏÎ¿Î¸Î·ÎºÎµÏÏÎ¿ÏÎ½ Î¿Î¹ ÏÏÎ¸Î¼Î¯ÏÎµÎ¹Ï ÏÎ±Ï."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -1105,6 +1114,9 @@ msgid ""
 "the option \"Request a bridge from torproject.org,\" click \"Request a New "
 "Bridge...\" for BridgeDB to provide a bridge."
 msgstr ""
+"Î£ÏÎ·Î½ ÎµÎ½ÏÏÎ·ÏÎ± Â«ÎÎÏÏÏÎµÏÂ» ÎµÏÎ¹Î»ÎÎ¾ÏÎµ ÏÎ¿ 
ÏÎµÏÏÎ¬Î³ÏÎ½Î¿ Â«Î§ÏÎ®ÏÎ· Î³ÎÏÏÏÎ±ÏÂ» ÎºÎ±Î¹ Î±ÏÏ ÏÎ·Î½ "
+"ÎµÏÎ¹Î»Î¿Î³Î® Â«ÎÎ·ÏÎµÎ¯ÏÏÎµ Î¼Î¹Î± Î³ÎÏÏÏÎ± Î±ÏÏ ÏÎ¿ 
torproject.orgÂ» ÏÎ±ÏÎ®ÏÏÎµ Â«ÎÎ·ÏÎµÎ¯ÏÏÎµ Î¼Î¹Î± "
+"ÎÎÎ± ÎÎÏÏÏÎ±..Â» ÏÏÏÎµ ÏÎ¿ BridgeDB Î½Î± ÏÎ±Ï 
ÏÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹ Î¼Î¹Î± Î³ÎÏÏÏÎ±."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -1112,6 +1124,8 @@ msgid ""
 "Complete the CAPTCHA and click \"Submit.\" Your setting will automatically "
 "be saved once you close the tab."
 msgstr ""
+"Î£ÏÎ¼ÏÎ»Î·ÏÏÏÏÎµ ÏÎ¿ CAPTCHA ÎºÎ±Î¹ ÏÎ±ÏÎ®ÏÏÎµ Â«Î¥ÏÎ¿Î²Î¿Î»Î®Â». 
ÎÎ¹ ÏÏÎ¸Î¼Î¯ÏÎµÎ¹Ï ÏÎ±Ï Î¸Î± "
+"Î±ÏÎ¿Î¸Î·ÎºÎµÏÏÎ¿ÏÎ½ Î±ÏÏÏÎ¼Î±ÏÎ± Î¼ÏÎ»Î¹Ï ÎºÎ»ÎµÎ¯ÏÎµÏÎµ ÏÎ¿Î½ 
ÏÎ¬ÎºÎµÎ»Î¿."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -1143,6 +1157,9 @@ msgid ""
 "\"Provide a bridge I know\" and enter each bridge address on a separate "
 "line."
 msgstr ""
+"ÎÏÎ¿Ï ÎµÏÎ¹Î»ÎÎ¾ÎµÏÎµ ÏÎ¿ ÏÎµÏÏÎ¬Î³ÏÎ½Î¿ Â«Î¤Î¿ Tor 
Î»Î¿Î³Î¿ÎºÏÎ¯Î½ÎµÏÎ±Î¹ ÏÏÎ·Î½ ÏÏÏÎ± Î¼Î¿ÏÂ», ÎµÏÎ¹Î»ÎÎ¾ÏÎµ "
+"Â«Î Î±ÏÎ±ÏÏÏÎ·ÏÎ· Î³ÎÏÏÏÎ±Ï ÏÎ·Î½ Î¿ÏÎ¿Î¯Î± Î³Î½ÏÏÎ¯Î¶ÏÂ» 
ÎºÎ±Î¹ ÎµÎ¹ÏÎ¬Î³ÎµÏÎµ ÏÎµ Î¾ÎµÏÏÏÎ¹ÏÏÎ® Î³ÏÎ±Î¼Î¼Î® ÏÎ·Î½ "
+"Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· ÏÎ·Ï ÎºÎ¬Î¸Îµ Î³ÎÏÏÏÎ±Ï."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -1156,6 +1173,9 @@ msgid ""
 "the option \"Provide a bridge I know,\" enter each bridge address on a "
 "separate line."
 msgstr ""
+"Î£ÏÎ·Î½ ÎµÎ½ÏÏÎ·ÏÎ± Â«ÎÎÏÏÏÎµÏÂ» ÎµÏÎ¹Î»ÎÎ¾ÏÎµ ÏÎ¿ 
ÏÎµÏÏÎ¬Î³ÏÎ½Î¿ Â«Î§ÏÎ®ÏÎ· Î³ÎÏÏÏÎ±ÏÂ» ÎºÎ±Î¹ Î±ÏÏ ÏÎ·Î½ "
+"ÎµÏÎ¹Î»Î¿Î³Î® Â«Î Î±ÏÎ±ÏÏÏÎ·ÏÎ· Î³ÎÏÏÏÎ±Ï ÏÎ·Î½ Î¿ÏÎ¿Î¯Î± 
Î³Î½ÏÏÎ¯Î¶ÏÂ» ÎµÎ¹ÏÎ¬Î³ÎµÏÎµ ÏÎµ Î¾ÎµÏÏÏÎ¹ÏÏÎ® Î³ÏÎ±Î¼Î¼Î® "
+"ÏÎ·Î½ Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· ÏÎ·Ï ÎºÎ¬Î¸Îµ Î³ÎÏÏÏÎ±Ï."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -2398,7 +2418,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.description)
 msgid "Learn about Tor for mobile devices"
-msgstr ""
+msgstr "ÎÎ¬Î¸ÎµÏÎµ Î³Î¹Î± ÏÎ¿ Tor Î³Î¹Î± ÏÎ¿ÏÎ·ÏÎÏ ÏÏÏÎºÎµÏÎÏ."
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2411,12 +2431,16 @@ msgid ""
 "Tor

[tor-commits] [translation/tails-onioncircuits_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-onioncircuits_release

2021-01-11 Thread translation

commit 4a69513cb6103fe9e634364e59266b1d5e066b13
Author: Translation commit bot 
Date:   Mon Jan 11 17:17:03 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=tails-onioncircuits_release
---
 pt_BR/onioncircuits.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/onioncircuits.po b/pt_BR/onioncircuits.po
index f22fa05b85..c7eecf32b0 100644
--- a/pt_BR/onioncircuits.po
+++ b/pt_BR/onioncircuits.po
@@ -5,7 +5,7 @@
 # Translators:
 # Communia , 2016-2018
 # Maicon Grahl , 2016
-# Rodrigo, 2016
+# Rhcastilhos, 2016
 # yyyan , 2020
 msgid ""
 msgstr ""

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.6.0esr-10.5-1] fixup! Bug 12620: TorBrowser regression tests

2021-01-11 Thread gk

commit fb5020a53fdf0c63533c4f7dc9697745f7c31163
Author: Alex Catarineu 
Date:   Fri Jan 8 16:07:11 2021 +0100

fixup! Bug 12620: TorBrowser regression tests
---
 run-tbb-tests| 1 -
 tbb-tests/browser_tor_bug2950.js | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/run-tbb-tests b/run-tbb-tests
index b12e62d942c9..1566c37c43cb 100755
--- a/run-tbb-tests
+++ b/run-tbb-tests
@@ -55,7 +55,6 @@ echo $'\n''Starting tests'
 --setpref network.file.path_blacklist='' \
 --setpref extensions.torbutton.use_nontor_proxy=true \
 --setpref browser.privatebrowsing.autostart=false \
---setpref security.nocertdb=false \
  "${tests[@]}"
 
 echo "*"
diff --git a/tbb-tests/browser_tor_bug2950.js b/tbb-tests/browser_tor_bug2950.js
index add683022d8e..16e41344a3c4 100644
--- a/tbb-tests/browser_tor_bug2950.js
+++ b/tbb-tests/browser_tor_bug2950.js
@@ -15,7 +15,7 @@ let Ci = Components.interfaces;
 
 // __principal(spec)__.
 // Creates a principal instance from a spec
-// (string address such as "http://torproject.org;).
+// (string address such as "https://www.torproject.org;).
 let principal = spec => 
Services.scriptSecurityManager.createContentPrincipalFromOrigin(spec);
 
 // __setPermission(spec, key, value)__.
@@ -37,7 +37,7 @@ let fileInProfile = fileName => FileUtils.File(profileDirPath 
+ "/" + fileName);
 
 // ## Now let's run the test.
 
-let SITE = "http://torproject.org;,
+let SITE = "https://www.torproject.org;,
 KEY = "popup";
 
 let permissionsFile = fileInProfile("permissions.sqlite"),



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.6.0esr-10.5-1] fixup! Bug 12620: TorBrowser regression tests

2021-01-11 Thread gk

commit 35ca9a2f3fcc7db381f9516ce570532bc9401717
Author: Alex Catarineu 
Date:   Fri Jan 8 21:03:51 2021 +0100

fixup! Bug 12620: TorBrowser regression tests
---
 tbb-tests/browser_tor_TB4.js | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tbb-tests/browser_tor_TB4.js b/tbb-tests/browser_tor_TB4.js
index f08d086e3815..8bb12f360e5e 100644
--- a/tbb-tests/browser_tor_TB4.js
+++ b/tbb-tests/browser_tor_TB4.js
@@ -1,9 +1,7 @@
 // # Test for TB4: Tor Browser's Firefox preference overrides
-// Simple regression tests to check the value of each pref and
-// decides if it is set as expected.
-
-// TODO: Write unit tests to check that each pref setting here
-// causes the browser to have the desired behavior (a big task).
+// This is a minimal test to check whether the 000-tor-browser.js
+// pref overrides are being used at all or not. More comprehensive
+// pref tests are maintained in the tor-browser-bundle-testsuite project.
 
 function test() {
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.6.0esr-10.5-1] fixup! Bug 12620: TorBrowser regression tests

2021-01-11 Thread gk

commit cde995d8d86fd85ec457cbb97e1ebd07a8160ee6
Author: Alex Catarineu 
Date:   Mon Jan 11 15:25:38 2021 +0100

fixup! Bug 12620: TorBrowser regression tests
---
 run-tbb-tests | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/run-tbb-tests b/run-tbb-tests
index 1566c37c43cb..bc09839f9f05 100755
--- a/run-tbb-tests
+++ b/run-tbb-tests
@@ -51,6 +51,9 @@ fi
 
 rm -f tbb-tests.log
 echo $'\n''Starting tests'
+# We need `security.nocertdb = false` because of #18087. That pref is
+# forced to have the same value as `browser.privatebrowsing.autostart` in
+# torbutton, so we just set `browser.privatebrowsing.autostart=false` here.
 ./mach mochitest --log-tbpl tbb-tests.log \
 --setpref network.file.path_blacklist='' \
 --setpref extensions.torbutton.use_nontor_proxy=true \

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.6.0esr-10.5-1] fixup! Bug 12620: TorBrowser regression tests

2021-01-11 Thread gk

commit af344650cbfb5527c9c6fc67a35eecf4e42a2560
Author: Alex Catarineu 
Date:   Wed Nov 4 21:05:43 2020 +0100

fixup! Bug 12620: TorBrowser regression tests
---
 tbb-tests/browser_tor_bug2950.js | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tbb-tests/browser_tor_bug2950.js b/tbb-tests/browser_tor_bug2950.js
index 010cc6356202..add683022d8e 100644
--- a/tbb-tests/browser_tor_bug2950.js
+++ b/tbb-tests/browser_tor_bug2950.js
@@ -13,19 +13,19 @@ let Ci = Components.interfaces;
 
 // ## utility functions
 
-// __uri(spec)__.
-// Creates an nsIURI instance from a spec
+// __principal(spec)__.
+// Creates a principal instance from a spec
 // (string address such as "http://torproject.org;).
-let uri = spec => Services.io.newURI(spec, null, null);
+let principal = spec => 
Services.scriptSecurityManager.createContentPrincipalFromOrigin(spec);
 
 // __setPermission(spec, key, value)__.
 // Sets the site permission of type key to value, for the site located at 
address spec.
-let setPermission = (spec, key, value) => SitePermissions.set(uri(spec), key, 
value);
+let setPermission = (spec, key, value) => 
SitePermissions.setForPrincipal(principal(spec), key, value);
 
 // __getPermission(spec, key)__.
 // Reads the site permission value for permission type key, for the site
 // located at address spec.
-let getPermission = (spec, key) => SitePermissions.get(uri(spec), key);
+let getPermission = (spec, key) => 
SitePermissions.getForPrincipal(principal(spec), key);
 
 // __profileDirPath__.
 // The Firefox Profile directory. Expected location of various persistent 
files.
@@ -54,12 +54,12 @@ let originalValue = getPermission(SITE, KEY);
 window.setTimeout(
   function () {
 // Set the permission to a new value.
-setPermission(SITE, KEY, (originalValue === 0) ? 1 : 0);
+setPermission(SITE, KEY, SitePermissions.BLOCK);
 // Now read back the permission value again.
 let newReadValue = getPermission(SITE, KEY);
 // Compare to confirm that the permission
 // value was successfully changed.
-isnot(newReadValue, originalValue, "Set a value in permissions db (perhaps 
in memory).");;
+Assert.notDeepEqual(originalValue, newReadValue, "Set a value in 
permissions db (perhaps in memory).");
 // If file existed or now exists, get the current time stamp.
 if (permissionsFile.exists()) {
   newModifiedTime = permissionsFile.lastModifiedTime;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.6.0esr-10.5-1] fixup! Bug 23104: Add a default line height compensation

2021-01-11 Thread gk

commit 4ce99eee684fb3d8b92ee51861b4bdc82bfb6599
Author: Alex Catarineu 
Date:   Fri Apr 3 21:34:55 2020 +0200

fixup! Bug 23104: Add a default line height compensation
---
 layout/generic/test/test_tor_bug23104.html | 15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/layout/generic/test/test_tor_bug23104.html 
b/layout/generic/test/test_tor_bug23104.html
index ae73a3446037..8ff1d2190c45 100644
--- a/layout/generic/test/test_tor_bug23104.html
+++ b/layout/generic/test/test_tor_bug23104.html
@@ -17,12 +17,10 @@
 Test1
 ÙÙÙØ©
 aÃ§Ã£o

[tor-commits] [tor-browser/tor-browser-78.6.0esr-10.5-1] fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing

2021-01-11 Thread gk

commit 28ea631ca62814105ac9d7b54b006e5a8208d320
Author: Alex Catarineu 
Date:   Wed Nov 4 21:04:52 2020 +0100

fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove 
Amazon, eBay, bing
---
 tbb-tests/browser_tor_omnibox.js | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tbb-tests/browser_tor_omnibox.js b/tbb-tests/browser_tor_omnibox.js
index e18b2a84a3d8..f3efd0c3da5e 100644
--- a/tbb-tests/browser_tor_omnibox.js
+++ b/tbb-tests/browser_tor_omnibox.js
@@ -1,14 +1,14 @@
 // # Test Tor Omnibox
 // Check what search engines are installed in the search box.
 
-function test() {
+add_task(async function() {
   // Grab engine IDs.
   let browserSearchService = 
Components.classes["@mozilla.org/browser/search-service;1"]
- 
.getService(Components.interfaces.nsIBrowserSearchService),
-  engineIDs = browserSearchService.getEngines().map(e => e.identifier);
+ 
.getService(Components.interfaces.nsISearchService),
+  engineIDs = (await browserSearchService.getEngines()).map(e => 
e.identifier);
 
   // Check that we have the correct engines installed, in the right order.
   is(engineIDs[0], "ddg", "Default search engine is duckduckgo");
   is(engineIDs[1], "youtube", "Secondary search engine is youtube");
   is(engineIDs[2], "google", "Google is third search engine");
-}
+});



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.6.0esr-10.5-1] fixup! Bug 12620: TorBrowser regression tests

2021-01-11 Thread gk

commit 1bfd61b1fcea926e3050f5a4751299c38feeab93
Author: Alex Catarineu 
Date:   Wed Nov 4 20:55:03 2020 +0100

fixup! Bug 12620: TorBrowser regression tests
---
 tbb-tests/browser_tor_TB4.js | 141 +++
 1 file changed, 8 insertions(+), 133 deletions(-)

diff --git a/tbb-tests/browser_tor_TB4.js b/tbb-tests/browser_tor_TB4.js
index af688bee0226..f08d086e3815 100644
--- a/tbb-tests/browser_tor_TB4.js
+++ b/tbb-tests/browser_tor_TB4.js
@@ -3,151 +3,26 @@
 // decides if it is set as expected.
 
 // TODO: Write unit tests to check that each pref setting here
-// causes the browser to have the desired behavior (a big task). 
+// causes the browser to have the desired behavior (a big task).
 
 function test() {
 
 let expectedPrefs = [
-   // Disable browser auto updaters and associated homepage notifications
-   ["app.update.auto", false],
-   ["app.update.enabled", false],
-   ["browser.search.update", false],
-   ["browser.rights.3.shown", true],
-   ["browser.startup.homepage_override.mstone", "ignore"],
-   ["startup.homepage_welcome_url", ""],
-   ["startup.homepage_override_url", ""],
+   // Homepage
+   ["browser.startup.homepage", "about:tor"],
 
// Disable the "Refresh" prompt that is displayed for stale profiles.
["browser.disableResetPrompt", true],
 
-   // Disk activity: Disable Browsing History Storage
-   ["browser.privatebrowsing.autostart", true],
-   ["browser.cache.disk.enable", false],
-   ["browser.cache.offline.enable", false],
-   ["dom.indexedDB.enabled", false],
-   ["permissions.memory_only", true],
-   ["network.cookie.lifetimePolicy", 2],
-   ["security.nocertdb", true],
-
-   // Disk activity: TBB Directory Isolation
-   ["browser.download.useDownloadDir", false],
-   ["browser.shell.checkDefaultBrowser", false],
-   ["browser.download.manager.addToRecentDocs", false],
-
-   // Misc privacy: Disk
-   ["signon.rememberSignons", false],
-   ["browser.formfill.enable", false],
-   ["signon.autofillForms", false],
-   ["browser.sessionstore.privacy_level", 2],
-   ["media.cache_size", 0],
-
-   // Misc privacy: Remote
-   ["browser.send_pings", false],
-   ["geo.enabled", false],
-   ["geo.wifi.uri", ""],
-   ["browser.search.suggest.enabled", false],
-   ["browser.safebrowsing.malware.enabled", false],
-   ["extensions.ui.lastCategory", "addons://list/extension"],
-   ["datareporting.healthreport.uploadEnabled", false],
-   ["datareporting.policy.dataSubmissionEnabled", false],
-   ["security.mixed_content.block_active_content", false], // Disable until 
https://bugzilla.mozilla.org/show_bug.cgi?id=878890 is patched
-   ["browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, 
\"bookmarks\":0}"], // Don't promote sync
-   ["services.sync.engine.prefs", false], // Never sync prefs, addons, or tabs 
with other browsers
-   ["services.sync.engine.addons", false],
-   ["services.sync.engine.tabs", false],
-   ["extensions.getAddons.cache.enabled", false], // 
https://blog.mozilla.org/addons/how-to-opt-out-of-add-on-metadata-updates/
-
-   // Fingerprinting
-   ["webgl.min_capability_mode", true],
-   ["webgl.disable-extensions", true],
-   ["dom.battery.enabled", false], // fingerprinting due to differing OS 
implementations
-   ["browser.display.max_font_attempts",10],
-   ["browser.display.max_font_count",10],
-   ["gfx.downloadable_fonts.fallback_delay", -1],
-   ["browser.startup.homepage_override.buildID", "20100101"],
-
-   // Third party stuff
-   ["network.cookie.cookieBehavior", 1],
-   ["security.enable_tls_session_tickets", false],
-   ["network.http.spdy.enabled", false], // Stores state and may have 
keepalive issues (both fixable)
-   ["network.http.spdy.enabled.v2", false], // Seems redundant, but just in 
case
-   ["network.http.spdy.enabled.v3", false], // Seems redundant, but just in 
case
-
-   // Proxy and proxy security
-   ["network.proxy.socks", "127.0.0.1"],
-   ["network.proxy.socks_port", 9150],
-   ["network.proxy.socks_remote_dns", true],
-   ["network.proxy.no_proxies_on", ""], // For fingerprinting and local 
service vulns (#10419)
-   ["network.proxy.type", 1],
-   ["network.security.ports.banned", "9050,9051,9150,9151"],
-   ["network.dns.disablePrefetch", true],
-   ["network.protocol-handler.external-default", false],
-   ["network.protocol-handler.external.mailto", false],
-   ["network.protocol-handler.external.news", false],
-   ["network.protocol-handler.external.nntp", false],
-   ["network.protocol-handler.external.snews", false],
-   ["network.protocol-handler.warn-external.mailto", true],
-   ["network.protocol-handler.warn-external.news", true],
-   ["network.protocol-handler.warn-external.nntp", true],
-   ["network.protocol-handler.warn-external.snews", true],
-
-   // Network and performance
-   ["network.http.pipelining", true],
-   ["network.http.pipelining.aggressive", true],
-   ["network.http.pipelining.maxrequests", 12],
-   ["network.http.pipelining.ssl", true],
-

[tor-commits] [tor-browser/tor-browser-78.6.0esr-10.5-1] fixup! Bug 16620: Clear window.name when no referrer sent

2021-01-11 Thread gk

commit 0523caa5191c3d976ff034c9ef621096079d89bf
Author: Alex Catarineu 
Date:   Fri Apr 3 21:23:10 2020 +0200

fixup! Bug 16620: Clear window.name when no referrer sent
---
 docshell/test/mochitest/test_tor_bug16620.html | 5 ++---
 docshell/test/mochitest/tor_bug16620.html  | 2 +-
 docshell/test/mochitest/tor_bug16620_form.html | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/docshell/test/mochitest/test_tor_bug16620.html 
b/docshell/test/mochitest/test_tor_bug16620.html
index f60a06711c17..46fff5a04711 100644
--- a/docshell/test/mochitest/test_tor_bug16620.html
+++ b/docshell/test/mochitest/test_tor_bug16620.html
@@ -13,8 +13,7 @@
 
 
 https://trac.torproject.org/projects/tor/ticket/16620;>Tor Bug 16620

[tor-commits] [tor-browser/tor-browser-78.6.0esr-10.5-1] fixup! Bug 12620: TorBrowser regression tests

2021-01-11 Thread gk

commit 71105880483c5629b017c2fca9e7f5c2f551039e
Author: Alex Catarineu 
Date:   Wed Nov 4 20:49:51 2020 +0100

fixup! Bug 12620: TorBrowser regression tests
---
 run-tbb-tests| 10 +++---
 tbb-tests-ignore.txt | 14 ++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/run-tbb-tests b/run-tbb-tests
index 5e266f9ba4cd..b12e62d942c9 100755
--- a/run-tbb-tests
+++ b/run-tbb-tests
@@ -18,8 +18,8 @@ then
 echo "Using tests list from file tbb-tests-list.txt"
 tests=($(cat tbb-tests-list.txt))
 else
-ffxbld_commit=$(git log -500 --format='%an %H' | grep '^ffxbld ' \
-| head -1 | cut -d ' ' -f 2)
+ffxbld_commit=$(git log -500 --format='oneline' | grep "TB3: Tor Browser's 
official .mozconfigs." \
+| head -1 | cut -d ' ' -f 1)
 
 tests=($(git diff --name-status "$ffxbld_commit" HEAD | \
 grep -e '^[AM].*/test_[^/]\+\.\(html\|xul\)$' \
@@ -51,7 +51,11 @@ fi
 
 rm -f tbb-tests.log
 echo $'\n''Starting tests'
-./mach mochitest --log-tbpl tbb-tests.log --setpref security.nocertdb=false \
+./mach mochitest --log-tbpl tbb-tests.log \
+--setpref network.file.path_blacklist='' \
+--setpref extensions.torbutton.use_nontor_proxy=true \
+--setpref browser.privatebrowsing.autostart=false \
+--setpref security.nocertdb=false \
  "${tests[@]}"
 
 echo "*"
diff --git a/tbb-tests-ignore.txt b/tbb-tests-ignore.txt
new file mode 100644
index ..f965010a7cd4
--- /dev/null
+++ b/tbb-tests-ignore.txt
@@ -0,0 +1,14 @@
+browser/extensions/onboarding/test/browser/browser_onboarding_accessibility.js
+browser/extensions/onboarding/test/browser/browser_onboarding_keyboard.js
+browser/extensions/onboarding/test/browser/browser_onboarding_notification.js
+browser/extensions/onboarding/test/browser/browser_onboarding_notification_2.js
+browser/extensions/onboarding/test/browser/browser_onboarding_notification_3.js
+browser/extensions/onboarding/test/browser/browser_onboarding_notification_4.js
+browser/extensions/onboarding/test/browser/browser_onboarding_notification_5.js
+browser/extensions/onboarding/test/browser/browser_onboarding_notification_click_auto_complete_tour.js
+browser/extensions/onboarding/test/browser/browser_onboarding_select_default_tour.js
+browser/extensions/onboarding/test/browser/browser_onboarding_skip_tour.js
+browser/extensions/onboarding/test/browser/browser_onboarding_tours.js
+browser/extensions/onboarding/test/browser/browser_onboarding_tourset.js
+browser/extensions/onboarding/test/browser/browser_onboarding_uitour.js
+



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-78.6.0esr-10.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core

2021-01-11 Thread gk

commit 34a9369817eadd73a6f0725bcd707002a596bdf3
Author: Georg Koppen 
Date:   Mon Jan 11 16:54:16 2021 +

fixup! Bug 10760: Integrate TorButton to TorBrowser core
---
 toolkit/torproject/torbutton | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton
index 4a258f4216e0..29744944f69c 16
--- a/toolkit/torproject/torbutton
+++ b/toolkit/torproject/torbutton
@@ -1 +1 @@
-Subproject commit 4a258f4216e0adfa65a60f89183c3441ac2e83f8
+Subproject commit 29744944f69c4d7faa509faae4b47dd27fcd3750

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbutton/master] Remove code dealing with torbutton UI button in toolbar

2021-01-11 Thread gk

commit 29744944f69c4d7faa509faae4b47dd27fcd3750
Author: Alex Catarineu 
Date:   Wed Jun 19 16:01:31 2019 +0200

Remove code dealing with torbutton UI button in toolbar

The torbutton does not exist anymore, so removing related
code that is now unused, like the new browser version
flashing warning and others.

Closes #28745.
---
 chrome/content/torbutton.js  | 52 
 chrome/locale/af/torbutton.properties|  4 ---
 chrome/locale/ak/torbutton.properties|  4 ---
 chrome/locale/am/torbutton.properties|  4 ---
 chrome/locale/ar/torbutton.properties|  4 ---
 chrome/locale/arn/torbutton.properties   |  4 ---
 chrome/locale/ast/torbutton.properties   |  4 ---
 chrome/locale/az/torbutton.properties|  4 ---
 chrome/locale/be/torbutton.properties|  4 ---
 chrome/locale/bg/torbutton.properties|  4 ---
 chrome/locale/bms/torbutton.properties   |  4 ---
 chrome/locale/bn-BD/torbutton.properties |  4 ---
 chrome/locale/bn-IN/torbutton.properties |  4 ---
 chrome/locale/bn/torbutton.properties|  4 ---
 chrome/locale/bo/torbutton.properties|  4 ---
 chrome/locale/br/torbutton.properties|  4 ---
 chrome/locale/bs/torbutton.properties|  4 ---
 chrome/locale/ca/torbutton.properties|  4 ---
 chrome/locale/cs/torbutton.properties|  4 ---
 chrome/locale/csb/torbutton.properties   |  4 ---
 chrome/locale/cy/torbutton.properties|  4 ---
 chrome/locale/da/torbutton.properties|  4 ---
 chrome/locale/de/torbutton.properties|  4 ---
 chrome/locale/dz/torbutton.properties|  4 ---
 chrome/locale/el/torbutton.properties|  4 ---
 chrome/locale/en-US/torbutton.properties |  4 ---
 chrome/locale/eo/torbutton.properties|  4 ---
 chrome/locale/es-AR/torbutton.properties |  4 ---
 chrome/locale/es-ES/torbutton.properties |  4 ---
 chrome/locale/et/torbutton.properties|  4 ---
 chrome/locale/eu/torbutton.properties|  4 ---
 chrome/locale/fa/torbutton.properties|  4 ---
 chrome/locale/fi/torbutton.properties|  4 ---
 chrome/locale/fil/torbutton.properties   |  4 ---
 chrome/locale/fo/torbutton.properties|  4 ---
 chrome/locale/fr/torbutton.properties|  4 ---
 chrome/locale/fur/torbutton.properties   |  4 ---
 chrome/locale/fy/torbutton.properties|  4 ---
 chrome/locale/ga-IE/torbutton.properties |  4 ---
 chrome/locale/gl/torbutton.properties|  4 ---
 chrome/locale/gu/torbutton.properties|  4 ---
 chrome/locale/gun/torbutton.properties   |  4 ---
 chrome/locale/ha/torbutton.properties|  4 ---
 chrome/locale/he/torbutton.properties|  4 ---
 chrome/locale/hi/torbutton.properties|  4 ---
 chrome/locale/hr/torbutton.properties|  4 ---
 chrome/locale/ht/torbutton.properties|  4 ---
 chrome/locale/hu/torbutton.properties|  4 ---
 chrome/locale/hy/torbutton.properties|  4 ---
 chrome/locale/id/torbutton.properties|  4 ---
 chrome/locale/is/torbutton.properties|  4 ---
 chrome/locale/it/torbutton.properties|  4 ---
 chrome/locale/ja/torbutton.properties|  4 ---
 chrome/locale/jv/torbutton.properties|  4 ---
 chrome/locale/ka/torbutton.properties|  4 ---
 chrome/locale/km/torbutton.properties|  4 ---
 chrome/locale/kn/torbutton.properties|  4 ---
 chrome/locale/ko/torbutton.properties|  4 ---
 chrome/locale/ku/torbutton.properties|  4 ---
 chrome/locale/kw/torbutton.properties|  4 ---
 chrome/locale/ky/torbutton.properties|  4 ---
 chrome/locale/lb/torbutton.properties|  4 ---
 chrome/locale/lg/torbutton.properties|  4 ---
 chrome/locale/ln/torbutton.properties|  4 ---
 chrome/locale/lo/torbutton.properties|  4 ---
 chrome/locale/lt/torbutton.properties|  4 ---
 chrome/locale/lv/torbutton.properties|  4 ---
 chrome/locale/mg/torbutton.properties|  4 ---
 chrome/locale/mi/torbutton.properties|  4 ---
 chrome/locale/mk/torbutton.properties|  4 ---
 chrome/locale/ml/torbutton.properties|  4 ---
 chrome/locale/mn/torbutton.properties|  4 ---
 chrome/locale/mr/torbutton.properties|  4 ---
 chrome/locale/ms/torbutton.properties|  4 ---
 chrome/locale/mt/torbutton.properties|  4 ---
 chrome/locale/my/torbutton.properties|  4 ---
 chrome/locale/nah/torbutton.properties   |  4 ---
 chrome/locale/nap/torbutton.properties   |  4 ---
 chrome/locale/nb-NO/torbutton.properties |  4 ---
 chrome/locale/ne/torbutton.properties|  4 ---
 chrome/locale/nl/torbutton.properties|  4 ---
 chrome/locale/nn/torbutton.properties|  4 ---
 chrome/locale/nso/torbutton.properties   |  4 ---
 chrome/locale/oc/torbutton.properties|  4 ---
 chrome/locale/or/torbutton.properties|  4 ---
 chrome/locale/pa/torbutton.properties|  4 ---
 chrome/locale/pap/torbutton.properties   |  4 ---
 chrome/locale/pl/torbutton.properties|  4 ---
 chrome/locale/pms/torbutton.properties   |  4 ---
 chrome/locale/ps/torbutton.properties|  4 ---

[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

2021-01-11 Thread translation

commit 6b2305f0bed2b53779e91781bb62b5c4828eb59e
Author: Translation commit bot 
Date:   Mon Jan 11 16:47:08 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+el.po | 18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/contents+el.po b/contents+el.po
index c1e7c34505..455231c846 100644
--- a/contents+el.po
+++ b/contents+el.po
@@ -881,12 +881,16 @@ msgid ""
 "After checking the checkbox \"Tor is censored in my country,\" choose the "
 "\"Select a built-in bridge\" option."
 msgstr ""
+"ÎÏÎ¿Ï ÎµÏÎ¹Î»ÎÎ¾ÎµÏÎµ ÏÎ¿ ÏÎµÏÏÎ¬Î³ÏÎ½Î¿ Â«Î¤Î¿ Tor 
Î»Î¿Î³Î¿ÎºÏÎ¯Î½ÎµÏÎ±Î¹ ÏÏÎ·Î½ ÏÏÏÎ± Î¼Î¿ÏÂ», ÎµÏÎ¹Î»ÎÎ¾ÏÎµ "
+"Â«ÎÎ¹Î±Î»ÎÎ¾ÏÎµ Î¼Î¹Î± ÎµÎ½ÏÏÎ¼Î±ÏÏÎ¼ÎÎ½Î· Î³ÎÏÏÏÎ±Â»."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid ""
 "From the dropdown, select whichever pluggable transport you'd like to use."
 msgstr ""
+"ÎÏÏ ÏÎ¿ Î±Î½Î±Î´Î¹ÏÎ»Î¿ÏÎ¼ÎµÎ½Î¿ Î¼ÎµÎ½Î¿Ï ÎµÏÎ¹Î»ÎÎ¾ÏÎµ 
Î¿ÏÎ¿Î¹Î±Î´Î®ÏÎ¿ÏÎµ Î¼ÎµÏÎ±Î²Î±Î»Î»ÏÎ¼ÎµÎ½Î· Î¼ÎµÏÎ±ÏÎ¿ÏÎ¬ "
+"ÎµÏÎ¹Î¸ÏÎ¼ÎµÎ¯ÏÎµ."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -894,6 +898,8 @@ msgid ""
 "Once you've selected the pluggable transport, click \"Connect\" to save your"
 " settings."
 msgstr ""
+"ÎÏÎ±Î½ ÎµÏÎ¹Î»ÎÎ¾ÎµÏÎµ ÏÎ·Î½ Î¼ÎµÏÎ±Î²Î±Î»Î»ÏÎ¼ÎµÎ½Î· 
Î¼ÎµÏÎ±ÏÎ¿ÏÎ¬, ÏÎ±ÏÎ®ÏÏÎµ Â«Î£ÏÎ½Î´ÎµÏÎ·Â» Î³Î¹Î± Î½Î± "
+"Î±ÏÎ¿Î¸Î·ÎºÎµÏÏÎ¿ÏÎ½ Î¿Î¹ ÏÏÎ¸Î¼Î¯ÏÎµÎ¹Ï ÏÎ±Ï."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -903,6 +909,8 @@ msgid ""
 "Or, if you have Tor Browser running, click on \"Preferences\" in the "
 "hamburger menu and then on \"Tor\" in the sidebar."
 msgstr ""
+"Î, Î±Î½ Î¿ Tor browser ÎµÎºÏÎµÎ»ÎµÎ¯ÏÎ±Î¹ Î®Î´Î·, ÏÎ±ÏÎ®ÏÏÎµ Â«Î 
ÏÎ¿ÏÎ¹Î¼Î®ÏÎµÎ¹ÏÂ» Î¼ÎÏÎ± Î±ÏÏ ÏÎ¿ Î¼ÎµÎ½Î¿Ï "
+"ÎµÏÎ¹Î»Î¿Î³ÏÎ½ Î¬Î½Ï Î´ÎµÎ¾Î¹Î¬ ÎºÎ±Î¹ Î¼ÎµÏÎ¬ Â«TorÂ» Î±ÏÏ ÏÎ·Î½ 
ÏÎ»ÎµÏÏÎ¹ÎºÎ® ÏÏÎ®Î»Î·."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -911,13 +919,16 @@ msgid ""
 "the option \"Select a built-in bridge,\" choose whichever pluggable "
 "transport you'd like to use from the dropdown."
 msgstr ""
+"Î£ÏÎ·Î½ ÎµÎ½ÏÏÎ·ÏÎ± Â«ÎÎÏÏÏÎµÏÂ» ÎµÏÎ¹Î»ÎÎ¾ÏÎµ ÏÎ¿ 
ÏÎµÏÏÎ¬Î³ÏÎ½Î¿ Â«Î§ÏÎ®ÏÎ· Î¼Î¹Î±Ï Î³ÎÏÏÏÎ±ÏÂ» ÎºÎ±Î¹ Î±ÏÏ "
+"ÏÎ·Î½ ÎµÏÎ¹Î»Î¿Î³Î® Â«ÎÎ¹Î±Î»ÎÎ¾ÏÎµ Î¼Î¹Î± ÎµÎ½ÏÏÎ¼Î±ÏÏÎ¼ÎÎ½Î· 
Î³ÎÏÏÏÎ±Â» ÎµÏÎ¹Î»ÎÎ¾ÏÎµ Î¿ÏÎ¿Î¹Î±Î´Î®ÏÎ¿ÏÎµ "
+"Î¼ÎµÏÎ±Î²Î±Î»Î»ÏÎ¼ÎµÎ½Î· Î¼ÎµÏÎ±ÏÎ¿ÏÎ¬ ÎµÏÎ¹Î¸ÏÎ¼ÎµÎ¯ÏÎµ Î±ÏÏ ÏÎ¿ 
Î±Î½Î±Î´Î¹ÏÎ»Î¿ÏÎ¼ÎµÎ½Î¿ Î¼ÎµÎ½Î¿Ï."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid "Your settings will automatically be saved once you close the tab."
-msgstr ""
+msgstr "ÎÎ¹ ÏÏÎ¸Î¼Î¯ÏÎµÎ¹Ï Î¸Î± Î±ÏÎ¿Î¸Î·ÎºÎµÏÏÎ¿ÏÎ½ Î±ÏÏÏÎ¼Î±Ï 
Î¼ÏÎ»Î¹Ï ÎºÎ»ÎµÎ¯ÏÎµÏÎµ ÏÎ¿Î½ ÏÎ¬ÎºÎµÎ»Î¿ (tab)."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -940,6 +951,9 @@ msgid ""
 "If you are trying to circumvent a blocked connection for the first time, you"
 " should try the different transports: obfs4, snowflake, or meek-azure."
 msgstr ""
+"ÎÎ½ ÏÏÎ¿ÏÏÎ±Î¸ÎµÎ¯ÏÎµ Î³Î¹Î± ÏÏÏÏÎ· ÏÎ¿ÏÎ¬ Î½Î± 
ÏÎ±ÏÎ±ÎºÎ¬Î¼ÏÎµÏÎµ Î¼Î¹Î± Î¼ÏÎ»Î¿ÎºÎ±ÏÎ¹ÏÎ¼ÎÎ½Î· ÏÏÎ½Î´ÎµÏÎ· Î¸Î± "
+"ÏÏÎÏÎµÎ¹ Î½Î± Î´Î¿ÎºÎ¹Î¼Î¬ÏÎµÏÎµ ÏÎ± Î´Î¹Î¬ÏÎ¿ÏÎ± 
ÏÏÏÏÏÎºÎ¿Î»Î»Î± Î¼ÎµÏÎ±ÏÎ¿ÏÎ¬Ï: obfs4, snowflake Î® "
+"meek-azure."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -947,6 +961,8 @@ msgid ""
 "If you try all of these options, and none of them gets you online, you will "
 "need to request a bridge or manually enter bridge addresses."
 msgstr ""
+"ÎÎ½ Î´Î¿ÎºÎ¹Î¼Î¬ÏÎ±ÏÎµ ÏÎ»ÎµÏ Î±ÏÏÎÏ ÏÎ¹Ï ÎµÏÎ¹Î»Î¿Î³ÎÏ ÎºÎ±Î¹ 
ÎºÎ±Î¼Î¼Î¯Î± Î´ÎµÎ½ ÏÎ±Ï ÏÏÎ½Î´ÎÎµÎ¹, ÏÏÎÏÎµÎ¹ Î½Î± "
+"Î±Î¹ÏÎ·Î¸ÎµÎ¯ÏÎµ Î¼Î¹Î± Î³ÎÏÏÏÎ± Î® Î½Î± ÎµÎ¹ÏÎ¬Î³ÎµÏÎµ 
ÏÎµÎ¹ÏÎ¿ÎºÎ¯Î½Î·ÏÎ± ÏÎ·Î½ Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ® ÏÎ·Ï."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/snowflakeaddon-messages.json_completed] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed

2021-01-11 Thread translation

commit 13fce33c788547f54f13366ad0d677f9fe1b0e99
Author: Translation commit bot 
Date:   Mon Jan 11 15:15:58 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed
---
 ru/messages.json | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ru/messages.json b/ru/messages.json
index dfe4c12695..668bd9d022 100644
--- a/ru/messages.json
+++ b/ru/messages.json
@@ -63,16 +63,16 @@
 "message": "Ð¡Ð¾Ð¾Ð±ÑÐ¸ÑÑ Ð¾Ð± Ð¾ÑÐ¸Ð±ÐºÐµ"
   },
   "fileBug": {
-"message": "ÐÑÐ»Ð¸ Ñ Ð²Ð°Ñ Ð²Ð¾Ð·Ð½Ð¸ÐºÐ»Ð° Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ð° ÑÐ¾ 
Snowflake Ð² ÐºÐ°ÑÐµÑÑÐ²Ðµ ÐºÐ»Ð¸ÐµÐ½ÑÐ° Ð¸Ð»Ð¸ 
Ð¿ÑÐ¾ÐºÑÐ¸-ÑÐµÑÐ²ÐµÑÐ°, Ð¿Ð¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, ÑÐ¾Ð¾Ð±ÑÐ¸ÑÐµ Ð½Ð°Ð¼."
+"message": "If you encounter problems with Snowflake as a client or a 
proxy, please consider filing a bug report.  There are two ways to file a bug 
report:"
   },
   "sharedAccount": {
-"message": "Ð¡Ð¾Ð·Ð´Ð°Ð¹ÑÐµ https://trac.torproject.org/projects/tor/register\;>ÑÐ¾Ð±ÑÑÐ²ÐµÐ½Ð½ÑÐ¹
 Ð°ÐºÐºÐ°ÑÐ½Ñ Ð¸Ð»Ð¸ https://trac.torproject.org/projects/tor/login\;>Ð²Ð¾Ð¹Ð´Ð¸ÑÐµ Ñ 
Ð¿ÑÐ±Ð»Ð¸ÑÐ½ÑÐ¼ Ð°ÐºÐºÐ°ÑÐ½ÑÐ¾Ð¼ cypherpunks (Ð¿Ð°ÑÐ¾Ð»Ñ 
writecode)."
+"message": "Edit the https://pad.riseup.net/p/tor-anti-censorship-bugs-keep\;>public 
bug-reporting pad of the anti-censorship team."
   },
   "bugTracker": {
-"message": "https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake\;>ÐÐ°Ð¿Ð¸ÑÐ¸ÑÐµ
 Ð¾ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ðµ, Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÑ Ð½Ð°Ñ Ð±Ð°Ð³-ÑÑÐµÐºÐµÑ."
+"message": "https://gitlab.torproject.org/\;>Request an 
account at the Tor Project GitLab, then https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/issues\;>open
 a new issue in the Snowflake project."
   },
   "descriptive": {
-"message": "ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿Ð¾ÑÑÐ°ÑÐ°Ð¹ÑÐµÑÑ ÐºÐ°Ðº 
Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð¾ Ð¾Ð¿Ð¸ÑÐ°ÑÑ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ. ÐÑÐ»Ð¸ Ñ Ð²Ð°Ñ 
ÐµÑÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ Ð¸Ð· Ð¶ÑÑÐ½Ð°Ð»Ð¾Ð² (Ð»Ð¾Ð³Ð¾Ð²), 
Ð¿ÑÐ¸Ð»Ð¾Ð¶Ð¸ÑÐµ Ð¸Ñ. ÐÐ½Ð¸ Ð¿Ð¾Ð¼Ð¾Ð³ÑÑ Ð²Ð¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÑÑÐ¸ 
Ð¾ÑÐ¸Ð±ÐºÑ. ÐÐ¾Ð»ÐµÐ·Ð½Ð¾ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ ÐºÐ»ÑÑÐµÐ²ÑÐµ ÑÐ»Ð¾Ð²Ð° 
snowflake-webextension Ð¸Ð»Ð¸ snowflake-client. Ð¢Ð°Ðº 
Ð±ÑÐ´ÐµÑ Ð¿Ð¾Ð½ÑÑÐ½ÐµÐµ, Ñ ÐºÐ°ÐºÐ¾Ð¹ ÑÐ°ÑÑÑÑ Snowflake 
Ð²Ð¾Ð·Ð½Ð¸ÐºÐ»Ð° Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ð°."
+"message": "Please try to be as descriptive as possible with your ticket 
and if possible include log messages that will help us reproduce the bug."
   },
   "embed": {
 "message": "ÐÑÑÑÐ¾Ð¸ÑÑ"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json

2021-01-11 Thread translation

commit 5cc9cd5342d0616aaff03527c47949b45dc51923
Author: Translation commit bot 
Date:   Mon Jan 11 15:15:57 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
---
 ru/messages.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ru/messages.json b/ru/messages.json
index 04db1b3637..5d452d6115 100644
--- a/ru/messages.json
+++ b/ru/messages.json
@@ -66,13 +66,13 @@
 "message": "ÐÑÐ»Ð¸ Ñ Ð²Ð°Ñ Ð²Ð¾Ð·Ð½Ð¸ÐºÐ»Ð¸ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ ÑÐ¾ 
Snowflake Ð² ÐºÐ°ÑÐµÑÑÐ²Ðµ ÐºÐ»Ð¸ÐµÐ½ÑÐ° Ð¸Ð»Ð¸ 
Ð¿ÑÐ¾ÐºÑÐ¸-ÑÐµÑÐ²ÐµÑÐ°, Ð¿Ð¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, ÑÐ°ÑÑÐ¼Ð¾ÑÑÐ¸ÑÐµ 
Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ Ð¾ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¾ÑÑÐµÑÐ° Ð¾Ð± Ð¾ÑÐ¸Ð±ÐºÐµ. 
ÐÑÑÑ Ð´Ð²Ð° ÑÐ¿Ð¾ÑÐ¾Ð±Ð° Ð¾ÑÐ¿ÑÐ°Ð²Ð¸ÑÑ Ð¾ÑÑÐµÑ Ð¾Ð± Ð¾ÑÐ¸Ð±ÐºÐµ:"
   },
   "sharedAccount": {
-"message": "Edit the https://pad.riseup.net/p/tor-anti-censorship-bugs-keep\;>public 
bug-reporting pad of the anti-censorship team."
+"message": "Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°ÑÑ https://pad.riseup.net/p/tor-anti-censorship-bugs-keep\;> 
Ð¾Ð±ÑÐµÐ´Ð¾ÑÑÑÐ¿Ð½ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹ Ð¾Ð± Ð¾ÑÐ¸Ð±ÐºÐ°Ñ 
 Ð¾Ñ Ð³ÑÑÐ¿Ð¿Ñ Ð¿Ð¾ Ð±Ð¾ÑÑÐ±Ðµ Ñ ÑÐµÐ½Ð·ÑÑÐ¾Ð¹."
   },
   "bugTracker": {
-"message": "https://gitlab.torproject.org/\;>Request an 
account at the Tor Project GitLab, then https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/issues\;>open
 a new issue in the Snowflake project."
+"message": "https://gitlab.torproject.org/\;>ÐÐ°Ð¿ÑÐ¾ÑÐ¸ÑÐµ 
ÑÑÐµÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ Ð² Tor Project GitLab, Ð·Ð°ÑÐµÐ¼https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/issues\;>
 Ð¾ÑÐºÑÐ¾Ð¹ÑÐµ Ð½Ð¾Ð²ÑÑ Ð·Ð°Ð´Ð°ÑÑ Ð² Ð¿ÑÐ¾ÐµÐºÑÐµ Snowflake."
   },
   "descriptive": {
-"message": "Please try to be as descriptive as possible with your ticket 
and if possible include log messages that will help us reproduce the bug."
+"message": "ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿Ð¾ÑÑÐ°ÑÐ°Ð¹ÑÐµÑÑ Ð±ÑÑÑ ÐºÐ°Ðº 
Ð¼Ð¾Ð¶Ð½Ð¾ Ð±Ð¾Ð»ÐµÐµ Ð¾Ð¿Ð¸ÑÐ°ÑÐµÐ»ÑÐ½ÑÐ¼ Ð² ÑÐ²Ð¾ÐµÐ¼ Ð·Ð°ÑÐ²Ð»ÐµÐ½Ð¸Ð¸ 
Ð¸, ÐµÑÐ»Ð¸ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, Ð²ÐºÐ»ÑÑÐ¸ÑÐµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ 
Ð¶ÑÑÐ½Ð°Ð»Ð°, ÐºÐ¾ÑÐ¾ÑÑÐµ Ð¿Ð¾Ð¼Ð¾Ð³ÑÑ Ð½Ð°Ð¼ Ð²Ð¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÑÑÐ¸ 
Ð¾ÑÐ¸Ð±ÐºÑ."
   },
   "embed": {
 "message": "ÐÑÑÑÐ¾Ð¸ÑÑ"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/fenix-torbrowserstringsxml] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml

2021-01-11 Thread translation

commit 7274bdc90a8a089a1265495055feeb7fda509fcf
Author: Translation commit bot 
Date:   Mon Jan 11 15:15:22 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml
---
 ru/torbrowser_strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ru/torbrowser_strings.xml b/ru/torbrowser_strings.xml
index 129140501e..556f177845 100644
--- a/ru/torbrowser_strings.xml
+++ b/ru/torbrowser_strings.xml
@@ -75,4 +75,5 @@
 
 ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ Tor.
 ÐÐµ Ð¿Ð¾Ð´Ð´Ð°Ð²Ð°Ð¹ÑÐµÑÑ 
Ð¿Ð°Ð½Ð´ÐµÐ¼Ð¸Ð¸ ÑÐ»ÐµÐ¶ÐºÐ¸.
-
+ÐÐ°ÑÐµ Ð¿Ð¾Ð¶ÐµÑÑÐ²Ð¾Ð²Ð°Ð½Ð¸Ðµ 
Ð±ÑÐ´ÐµÑ Ð¿Ð¾Ð»ÐµÐ·Ð½ÑÐ¼ Ð´Ð»Ñ ÐÑÑÐ·ÐµÐ¹ Tor.
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb

2021-01-11 Thread translation

commit cfd75728495c6aa1f3c842c16ae21cf79b737acc
Author: Translation commit bot 
Date:   Mon Jan 11 15:15:06 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
---
 ru/LC_MESSAGES/bridgedb.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ru/LC_MESSAGES/bridgedb.po b/ru/LC_MESSAGES/bridgedb.po
index 287a4fd263..44fa88e35d 100644
--- a/ru/LC_MESSAGES/bridgedb.po
+++ b/ru/LC_MESSAGES/bridgedb.po
@@ -16,6 +16,7 @@
 # joshua ridney, 2015
 # Kalyuzhniy Aleksey, 2017
 # liquixis, 2012
+# Michael Radchenko, 2021
 # Misha Dyachuk , 2016
 # Oleg, 2014
 # Roberto Brigante, 2017
@@ -34,8 +35,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2020-05-14 14:21-0700\n"
-"PO-Revision-Date: 2021-01-03 10:15+\n"
-"Last-Translator: Ziggi\n"
+"PO-Revision-Date: 2021-01-11 15:02+\n"
+"Last-Translator: Michael Radchenko\n"
 "Language-Team: Russian 
(http://www.transifex.com/otf/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -413,7 +414,7 @@ msgstr ""
 
 #: bridgedb/strings.py:173
 msgid "(Request unobfuscated Tor bridges.)"
-msgstr ""
+msgstr "(ÐÐ°Ð¿ÑÐ¾ÑÐ¸ÑÑ Ð½ÐµÐ¼Ð°ÑÐºÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ Ð¼Ð¾ÑÑÑ Tor.)"
 
 #: bridgedb/strings.py:174
 msgid "(Request IPv6 bridges.)"
@@ -421,4 +422,4 @@ msgstr "ÐÐ°Ð¿ÑÐ¾ÑÐ¸ÑÑ Ð¼Ð¾ÑÑÑ Ñ 
Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÐ¾Ð¹ IPv6."
 
 #: bridgedb/strings.py:175
 msgid "(Request obfs4 obfuscated bridges.)"
-msgstr ""
+msgstr "(ÐÐ°Ð¿ÑÐ¾ÑÐ¸ÑÑ Ð¼Ð°ÑÐºÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ Ð¼Ð¾ÑÑÑ obfs4)"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage

2021-01-11 Thread translation

commit 37f33d76874d1196c64be9173075872e1244aeec
Author: Translation commit bot 
Date:   Mon Jan 11 15:15:02 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
---
 ru/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ru/aboutTor.dtd b/ru/aboutTor.dtd
index aa915a1491..e6238e8224 100644
--- a/ru/aboutTor.dtd
+++ b/ru/aboutTor.dtd
@@ -33,4 +33,4 @@
 
 
 
-
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

2021-01-11 Thread translation

commit d13b6763b382d13ebab148afbce05723ac583f13
Author: Translation commit bot 
Date:   Mon Jan 11 14:46:44 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 ar.po | 6 +++---
 uk.po | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ar.po b/ar.po
index e8a10f8d91..75c461971e 100644
--- a/ar.po
+++ b/ar.po
@@ -25,7 +25,7 @@
 # stayanonymous, 2015
 # Mohammed ALDOUB , 2013
 # Mustafa , 2020
-# NASIâ¿ , 2020
+# NASIâ¿ , 2020-2021
 # Osama H. Qasho , 2014
 # Osama M. Mneina , 2014
 # Sherief Alaa , 2013
@@ -37,8 +37,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-05 11:44+0100\n"
-"PO-Revision-Date: 2021-01-05 12:15+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-01-11 14:35+\n"
+"Last-Translator: NASIâ¿ \n"
 "Language-Team: Arabic 
(http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/uk.po b/uk.po
index 20a6088c55..9234d9a234 100644
--- a/uk.po
+++ b/uk.po
@@ -6,7 +6,7 @@
 # jonny_nut, 2014
 # 897b2b5cdc927df55351e4b7d9378e5f_8d08a40 
, 2016
 # LinuxChata, 2014
-# Michael Radchenko , 2021
+# Michael Radchenko, 2021
 # O Herenko , 2018
 # Oleksii Golub , 2015
 # Pinro Lomil , 2013
@@ -20,8 +20,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-05 11:44+0100\n"
-"PO-Revision-Date: 2021-01-11 14:16+\n"
-"Last-Translator: Michael Radchenko \n"
+"PO-Revision-Date: 2021-01-11 14:18+\n"
+"Last-Translator: Michael Radchenko\n"
 "Language-Team: Ukrainian 
(http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

2021-01-11 Thread translation

commit 60941104bb473f719620e877539f3cd65b35489a
Author: Translation commit bot 
Date:   Mon Jan 11 14:46:01 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 ar.po | 10 +-
 uk.po | 14 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ar.po b/ar.po
index b2213fdc97..e5342f9072 100644
--- a/ar.po
+++ b/ar.po
@@ -25,7 +25,7 @@
 # stayanonymous, 2015
 # Mohammed ALDOUB , 2013
 # Mustafa , 2020
-# NASIâ¿ , 2020
+# NASIâ¿ , 2020-2021
 # Osama H. Qasho , 2014
 # Osama M. Mneina , 2014
 # Sherief Alaa , 2013
@@ -37,8 +37,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-05 11:44+0100\n"
-"PO-Revision-Date: 2021-01-05 12:15+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-01-11 14:35+\n"
+"Last-Translator: NASIâ¿ \n"
 "Language-Team: Arabic 
(http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -314,7 +314,7 @@ msgid ""
 "The network connection will be disabled when applying the upgrade.\n"
 "\n"
 "Please save your work and close all other applications."
-msgstr ""
+msgstr "ØªÙ ØªÙØ²ÙÙ Ø§ÙØªØ±ÙÙØ© Ø¨ÙØ¬Ø§Ø.\n\nØ³ÙØªÙ ØªØ¹Ø·ÙÙ 
Ø§ØªØµØ§Ù Ø§ÙØ´Ø¨ÙØ© Ø¹ÙØ¯ ØªØ·Ø¨ÙÙ Ø§ÙØªØ±ÙÙØ©.\nÙØ±Ø¬Ù ØÙØ¸ Ø¹Ù
ÙÙ ÙØ¥ØºÙØ§Ù Ø¬ÙÙØ¹ Ø§ÙØªØ·Ø¨ÙÙØ§Øª Ø§ÙØ£Ø®Ø±Ù."
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:700
 msgid "Upgrade successfully downloaded"
@@ -379,7 +379,7 @@ msgid ""
 "Your Tails device is being upgraded...\n"
 "\n"
 "For security reasons, the network connection is now disabled."
-msgstr ""
+msgstr "ØªØªÙ ØªØ±ÙÙØ© Ø¬ÙØ§Ø² Tails Ø§ÙØ®Ø§Øµ Ø¨Ù 
...\n\nÙØ£Ø³Ø¨Ø§Ø¨ ØªØªØ¹ÙÙ Ø¨Ø§ÙØ£ÙØ§Ù Ø ØªÙ ØªØ¹Ø·ÙÙ Ø§ØªØµØ§Ù 
Ø§ÙØ´Ø¨ÙØ© Ø§ÙØ¢Ù."
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:796
 msgid ""
diff --git a/uk.po b/uk.po
index 342c2e8669..c107fe4b54 100644
--- a/uk.po
+++ b/uk.po
@@ -6,7 +6,7 @@
 # jonny_nut, 2014
 # 897b2b5cdc927df55351e4b7d9378e5f_8d08a40 
, 2016
 # LinuxChata, 2014
-# Michael Radchenko , 2021
+# Michael Radchenko, 2021
 # O Herenko , 2018
 # Oleksii Golub , 2015
 # Pinro Lomil , 2013
@@ -20,8 +20,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-05 11:44+0100\n"
-"PO-Revision-Date: 2021-01-11 14:16+\n"
-"Last-Translator: Michael Radchenko \n"
+"PO-Revision-Date: 2021-01-11 14:18+\n"
+"Last-Translator: Michael Radchenko\n"
 "Language-Team: Ukrainian 
(http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1337,7 +1337,7 @@ msgstr "ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ"
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:223
 #, python-brace-format
 msgid "{beginning} and {last}"
-msgstr ""
+msgstr "{Ð¿Ð¾ÑÐ°ÑÐ¾Ðº} ÑÐ° {ÐºÑÐ½ÐµÑÑ}"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:224
 msgid ", "
@@ -1359,7 +1359,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:294
 msgid "Install Every Time"
-msgstr ""
+msgstr "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÑÐ²Ð°ÑÐ¸ ÐºÐ¾Ð¶Ð½Ð¾Ð³Ð¾ ÑÐ°Ð·Ñ"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:295
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:326
@@ -1422,7 +1422,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:546
 msgid "This can take several minutes."
-msgstr ""
+msgstr "Ð¦Ðµ Ð¼Ð¾Ð¶Ðµ Ð·Ð°Ð¹Ð½ÑÑÐ¸ Ð´ÐµÐºÑÐ»ÑÐºÐ° ÑÐ²Ð¸Ð»Ð¸Ð½."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:559
 msgid "The installation of your additional software failed"
@@ -1507,7 +1507,7 @@ msgstr ""
 
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:251
 msgid "[package not available]"
-msgstr ""
+msgstr "[Ð¿Ð°ÐºÐµÑ Ð½ÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð¸Ð¹]"
 
 #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:51
 msgid "Synchronizing the system's clock"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings

2021-01-11 Thread translation

commit b9c163282bfaec31f88a1ad63337dbf2788180d6
Author: Translation commit bot 
Date:   Mon Jan 11 14:18:43 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
---
 uk/network-settings.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uk/network-settings.dtd b/uk/network-settings.dtd
index c47c52ef03..8b08ff47b7 100644
--- a/uk/network-settings.dtd
+++ b/uk/network-settings.dtd
@@ -37,7 +37,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2021-01-11 Thread translation

commit 52a71ee549e42bdb8298cc61a6e5677ca058524a
Author: Translation commit bot 
Date:   Mon Jan 11 14:19:03 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+uk.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+uk.po b/contents+uk.po
index 4193e2..d9cacc27d3 100644
--- a/contents+uk.po
+++ b/contents+uk.po
@@ -10392,7 +10392,7 @@ msgstr ""
 
 #: lego/templates/banner.html:20 templates/banner.html:20
 msgid "Resist the surveillance pandemic."
-msgstr ""
+msgstr "ÐÐ°ÑÐ¸ÑÑÑÑÑÑÑ Ð²ÑÐ´ Ð¿Ð°Ð½Ð´ÐµÐ¼ÑÑ ÑÑÐµÐ¶ÐµÐ½Ð½Ñ."
 
 #: lego/templates/banner.html:33 lego/templates/footer.html:64
 #: lego/templates/footer.html:66 lego/templates/navbar.html:19

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web

2021-01-11 Thread translation

commit 134190cc9775ad0575d1f365b7885d9e7b42c233
Author: Translation commit bot 
Date:   Mon Jan 11 14:18:49 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
---
 contents+uk.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contents+uk.po b/contents+uk.po
index 22f95ce47c..f45cecee2d 100644
--- a/contents+uk.po
+++ b/contents+uk.po
@@ -7,6 +7,7 @@
 # IDRASSI Mounir , 2019
 # erinm, 2020
 # nobik , 2020
+# Michael Radchenko , 2021
 # 
 msgid ""
 msgstr ""
@@ -14,7 +15,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-02-24 13:39+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: nobik , 2020\n"
+"Last-Translator: Michael Radchenko , 2021\n"
 "Language-Team: Ukrainian (https://www.transifex.com/otf/teams/1519/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1379,4 +1380,4 @@ msgstr ""
 
 #: lego/templates/banner.html:20 templates/banner.html:20
 msgid "Resist the surveillance pandemic."
-msgstr ""
+msgstr "ÐÐ°ÑÐ¸ÑÑÑÑÑÑÑ Ð²ÑÐ´ Ð¿Ð°Ð½Ð´ÐµÐ¼ÑÑ ÑÑÐµÐ¶ÐµÐ½Ð½Ñ."

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

2021-01-11 Thread translation

commit e56596b2a5c4d62d47fa232d7eadff28434f
Author: Translation commit bot 
Date:   Mon Jan 11 14:17:18 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 uk.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/uk.po b/uk.po
index 640045db7f..20a6088c55 100644
--- a/uk.po
+++ b/uk.po
@@ -6,6 +6,7 @@
 # jonny_nut, 2014
 # 897b2b5cdc927df55351e4b7d9378e5f_8d08a40 
, 2016
 # LinuxChata, 2014
+# Michael Radchenko , 2021
 # O Herenko , 2018
 # Oleksii Golub , 2015
 # Pinro Lomil , 2013
@@ -19,8 +20,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-05 11:44+0100\n"
-"PO-Revision-Date: 2021-01-05 12:15+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-01-11 14:16+\n"
+"Last-Translator: Michael Radchenko \n"
 "Language-Team: Ukrainian 
(http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

2021-01-11 Thread translation

commit 476e9dc915d38e3ac7dcaf99bd144b3c458ea860
Author: Translation commit bot 
Date:   Mon Jan 11 14:16:23 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 uk.po | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/uk.po b/uk.po
index 2e3bd76e5a..342c2e8669 100644
--- a/uk.po
+++ b/uk.po
@@ -6,6 +6,7 @@
 # jonny_nut, 2014
 # 897b2b5cdc927df55351e4b7d9378e5f_8d08a40 
, 2016
 # LinuxChata, 2014
+# Michael Radchenko , 2021
 # O Herenko , 2018
 # Oleksii Golub , 2015
 # Pinro Lomil , 2013
@@ -19,8 +20,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-05 11:44+0100\n"
-"PO-Revision-Date: 2021-01-05 12:15+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-01-11 14:16+\n"
+"Last-Translator: Michael Radchenko \n"
 "Language-Team: Ukrainian 
(http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1325,7 +1326,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:157
 msgid "Show Log"
-msgstr ""
+msgstr "ÐÐ¾ÐºÐ°Ð·Ð°ÑÐ¸ Ð¶ÑÑÐ½Ð°Ð»"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:157
 msgid "Configure"
@@ -1408,7 +1409,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:363
 #, python-brace-format
 msgid "This will stop installing {packages} automatically."
-msgstr ""
+msgstr "Ð¦Ðµ Ð¿ÑÐ¸Ð¿Ð¸Ð½Ð¸ÑÑ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ {Ð¿Ð°ÐºÐµÑÑÐ²} 
Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐ½Ð¾."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:365
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:154
@@ -1433,7 +1434,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:594
 msgid "The check for upgrades of your additional software failed"
-msgstr ""
+msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð¿ÐµÑÐµÐ²ÑÑÐ¸ÑÐ¸ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ 
Ð´Ð¾Ð´Ð°ÑÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð½Ð¾Ð³Ð¾ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑÐµÐ½Ð½Ñ"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:596
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:604
@@ -1654,7 +1655,7 @@ msgstr "Ð¡ÑÐ°ÑÑÑ Tor"
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/torsta...@tails.boum.org/extension.js:50
 msgid "Open Onion Circuits"
-msgstr ""
+msgstr "ÐÑÐ´ÐºÑÐ¸ÑÑ Ð¦Ð¸Ð±ÑÐ»ÑÐ½Ñ ÐÐ°Ð½ÑÑÐ¶ÐºÐ¸"
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced. They need

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/fenix-torbrowserstringsxml] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml

2021-01-11 Thread translation

commit 5fc568959b17073dc782b324fa6c0236951d9e11
Author: Translation commit bot 
Date:   Mon Jan 11 14:15:47 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml
---
 uk/torbrowser_strings.xml | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/uk/torbrowser_strings.xml b/uk/torbrowser_strings.xml
index e26613109e..3db750e8df 100644
--- a/uk/torbrowser_strings.xml
+++ b/uk/torbrowser_strings.xml
@@ -66,5 +66,14 @@
 Ð¡ÑÐ°Ð½Ð´Ð°ÑÑ
 Ð£ÑÑ 
Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ° Tor ÑÐ° Ð²ÐµÐ±-ÑÐ°Ð¹ÑÑ 
ÑÐ²ÑÐ¼ÐºÐ½ÐµÐ½Ñ.
 ÐÐµÐ·Ð¿ÐµÑÐ½ÑÑÐµ
+ÐÐ¸Ð¼ÐºÐ½ÑÑÐ¸ 
ÑÑÐ½ÐºÑÑÑ Ð²ÐµÐ±-ÑÐ°Ð¹ÑÑÐ², ÑÐºÑ ÑÐ°ÑÑÐ¾ Ñ 
Ð½ÐµÐ±ÐµÐ·Ð¿ÐµÑÐ½Ð¸Ð¼Ð¸, Ð²ÑÑÐ°ÑÐ¸Ð²ÑÐ¸ ÑÑÐ½ÐºÑÑÐ¾Ð½Ð°Ð»ÑÐ½ÑÑÑÑ 
Ð´ÐµÑÐºÐ¸Ñ ÑÐ°Ð¹ÑÑÐ².
 ÐÐ°Ð¹Ð±ÐµÐ·Ð¿ÐµÑÐ½ÑÑÐ¸Ð¹
-
+ÐÐ¾Ð·Ð²Ð¾Ð»Ð¸ÑÐ¸ 
Ð»Ð¸ÑÐµ ÑÑÐ½ÐºÑÑÑ Ð²ÐµÐ±-ÑÐ°Ð¹ÑÑÐ², Ð½ÐµÐ¾Ð±ÑÑÐ´Ð½Ñ Ð´Ð»Ñ 
ÑÑÐ°ÑÐ¸ÑÐ½Ð¸Ñ ÑÐ°Ð¹ÑÑÐ² ÑÐ° Ð±Ð°Ð·Ð¾Ð²Ð¸Ñ Ð¿Ð¾ÑÐ»ÑÐ³. Ð¦Ñ 
Ð·Ð¼ÑÐ½Ð¸ Ð²Ð¿Ð»Ð¸Ð²Ð°ÑÑÑ Ð½Ð° Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ñ, Ð¼ÐµÐ´ÑÐ° ÑÐ° 
ÑÑÐµÐ½Ð°ÑÑÑ.
+
+
+ÐÐ°Ð¿Ð¸ÑÑÐ²Ð°ÑÐ¸ Ð°Ð½Ð³Ð»ÑÐ¹ÑÑÐºÑ 
Ð²ÐµÑÑÑÑ Ð²ÐµÐ±-ÑÑÐ¾ÑÑÐ½Ð¾Ðº Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÐ¿ÑÐµÐ½Ð½Ñ 
ÐºÐ¾Ð½ÑÑÐ´ÐµÐ½ÑÑÐ¹Ð½Ð¾ÑÑÑ
+
+ÐÐ¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÐ¹ÑÐµ 
Ð¼Ð°ÑÐºÑ, Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÐ¹ÑÐµ Tor.
+ÐÐ°ÑÐ¸ÑÑÑÑÑÑÑ Ð²ÑÐ´ 
Ð¿Ð°Ð½Ð´ÐµÐ¼ÑÑ ÑÑÐµÐ¶ÐµÐ½Ð½Ñ.
+ÐÐ°ÑÐ° Ð¿Ð¾Ð¶ÐµÑÑÐ²Ð° Ð±ÑÐ´Ðµ 
ÐºÐ¾ÑÐ¸ÑÐ½Ð¾Ñ ÐÑÑÐ·ÑÐ¼ Tor.
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/abouttor-homepage_completed] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed

2021-01-11 Thread translation

commit cf6ce36c16ccb0141e1cf6bb3a5ed9a11a05ba1e
Author: Translation commit bot 
Date:   Mon Jan 11 14:15:04 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed
---
 uk/aboutTor.dtd | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/uk/aboutTor.dtd b/uk/aboutTor.dtd
index df206fd01a..c91e30ad52 100644
--- a/uk/aboutTor.dtd
+++ b/uk/aboutTor.dtd
@@ -27,5 +27,10 @@
 
 
 
-
+
 
+
+
+
+
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

1 2 >

1 - 100 of 115 matches

Mail list logo