date:20211021

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

2021-10-21 Thread translation

commit 1cc1f79656f4428ebd8d05a7b41beddb3563a210
Author: Translation commit bot 
Date:   Fri Oct 22 04:47:54 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=support-portal_completed
---
 contents+tr.po | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/contents+tr.po b/contents+tr.po
index 66eeda9cea..5b04beb3d4 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -628,6 +628,9 @@ msgid ""
 "Fore more information see this [blogpost about domain "
 "fronting](https://blog.torproject.org/domain-fronting-critical-open-web)."
 msgstr ""
+"AyrÄ±ntÄ±lÄ± bilgi almak iÃ§in [etki alanÄ± yÃ¼zÃ¼nÃ¼ deÄiÅtirmek 
hakkÄ±ndaki bu blog"
+" yazÄ±sÄ±na](https://blog.torproject.org/domain-fronting-critical-open-web) "
+"bakabilirsiniz."
 
 #: https//support.torproject.org/glossary/domain-fronting/
 #: (content/glossary/domain-fronting/contents+en.lrword.spelling)
@@ -4032,6 +4035,8 @@ msgid ""
 "When we distribute the source code or a package, we digitally sign it with "
 "[GNU Privacy Guard](https://www.gnupg.org/)."
 msgstr ""
+"Kaynak kodunu ya da bir paketi daÄÄ±tÄ±rken [GNU Privacy "
+"Guard](https://www.gnupg.org/) ile sayÄ±sal olarak imzalÄ±yoruz."
 
 #: https//support.torproject.org/about/key-management/
 #: (content/about/key-management/contents+en.lrquestion.description)
@@ -4039,6 +4044,8 @@ msgid ""
 "See the [instructions on how to check Tor Browser's signature](../../tbb"
 "/how-to-verify-signature/)."
 msgstr ""
+"[Tor Browser imzasÄ±nÄ± denetleme yÃ¶nergeleri](../../tbb/how-to-verify-"
+"signature/) bÃ¶lÃ¼mÃ¼ne bakabilirsiniz."
 
 #: https//support.torproject.org/about/key-management/
 #: (content/about/key-management/contents+en.lrquestion.description)
@@ -13977,12 +13984,12 @@ msgstr "Terimler SÃ¶zlÃ¼ÄÃ¼"
 #: https//support.torproject.org/misc/menu/
 #: (content/misc/menu/contents+en.lrquestion.description)
 msgid "Alternate Designs"
-msgstr ""
+msgstr "DiÄer TasarÄ±mlar"
 
 #: https//support.torproject.org/misc/menu/
 #: (content/misc/menu/contents+en.lrquestion.description)
 msgid "little-t-tor"
-msgstr ""
+msgstr "little-t-tor"
 
 #: https//support.torproject.org/misc/menu/
 #: (content/misc/menu/contents+en.lrquestion.description)
@@ -15164,7 +15171,7 @@ msgstr ""
 #: https//support.torproject.org/apt/tor-ubuntu/
 #: (content/apt/tor-ubuntu/contents+en.lrquestion.description)
 msgid "Instead, please use [Tor Debian repository](../tor-deb-repo/)."
-msgstr ""
+msgstr "Onun yerine, lÃ¼tfen [Tor Debian deposunu](/../tor-deb-repo) 
kullanÄ±n."
 
 #: https//support.torproject.org/rpm/tor-rpm-install/
 #: (content/rpm/install/contents+en.lrquestion.title)

___
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-10-21 Thread translation

commit 8b60163bdab417494236ef7ba771241a12867530
Author: Translation commit bot 
Date:   Fri Oct 22 04:47:51 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+tr.po | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/contents+tr.po b/contents+tr.po
index 0b5e93ad3f..5b04beb3d4 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -4044,6 +4044,8 @@ msgid ""
 "See the [instructions on how to check Tor Browser's signature](../../tbb"
 "/how-to-verify-signature/)."
 msgstr ""
+"[Tor Browser imzasÄ±nÄ± denetleme yÃ¶nergeleri](../../tbb/how-to-verify-"
+"signature/) bÃ¶lÃ¼mÃ¼ne bakabilirsiniz."
 
 #: https//support.torproject.org/about/key-management/
 #: (content/about/key-management/contents+en.lrquestion.description)
@@ -13982,12 +13984,12 @@ msgstr "Terimler SÃ¶zlÃ¼ÄÃ¼"
 #: https//support.torproject.org/misc/menu/
 #: (content/misc/menu/contents+en.lrquestion.description)
 msgid "Alternate Designs"
-msgstr ""
+msgstr "DiÄer TasarÄ±mlar"
 
 #: https//support.torproject.org/misc/menu/
 #: (content/misc/menu/contents+en.lrquestion.description)
 msgid "little-t-tor"
-msgstr ""
+msgstr "little-t-tor"
 
 #: https//support.torproject.org/misc/menu/
 #: (content/misc/menu/contents+en.lrquestion.description)
@@ -15169,7 +15171,7 @@ msgstr ""
 #: https//support.torproject.org/apt/tor-ubuntu/
 #: (content/apt/tor-ubuntu/contents+en.lrquestion.description)
 msgid "Instead, please use [Tor Debian repository](../tor-deb-repo/)."
-msgstr ""
+msgstr "Onun yerine, lÃ¼tfen [Tor Debian deposunu](/../tor-deb-repo) 
kullanÄ±n."
 
 #: https//support.torproject.org/rpm/tor-rpm-install/
 #: (content/rpm/install/contents+en.lrquestion.title)

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

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

2021-10-21 Thread translation

commit 942c4da7ea49418c972305b6a35b01b682b2d0b4
Author: Translation commit bot 
Date:   Fri Oct 22 04:47:21 2021 +


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

diff --git a/tr/torbutton.dtd b/tr/torbutton.dtd
index 36808d1b8f..d72a124236 100644
--- a/tr/torbutton.dtd
+++ b/tr/torbutton.dtd
@@ -45,7 +45,7 @@
 
 
 
-
+
 
 
 

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

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

2021-10-21 Thread translation

commit 7d26bef2398d6823bb3f328127fc9980fb89c538
Author: Translation commit bot 
Date:   Fri Oct 22 04:47:19 2021 +


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

diff --git a/tr/torbutton.dtd b/tr/torbutton.dtd
index 1976518489..d72a124236 100644
--- a/tr/torbutton.dtd
+++ b/tr/torbutton.dtd
@@ -45,7 +45,7 @@
 
 
 
-
+
 
 
 

___
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-10-21 Thread translation

commit 9839f28f2c813b3c4bc6348f272817860f7a5bfa
Author: Translation commit bot 
Date:   Fri Oct 22 04:45:03 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
---
 tr/aboutTor.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd
index 7496155b54..66c47ece28 100644
--- a/tr/aboutTor.dtd
+++ b/tr/aboutTor.dtd
@@ -47,7 +47,7 @@
 
   Thank you!
 -->
-
+
 
 
-
+

___
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-10-21 Thread translation

commit d1686a804553089857c48644f6501dd4ecaefaa6
Author: Translation commit bot 
Date:   Fri Oct 22 04:45:05 2021 +


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

diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd
index 3511d8e030..66c47ece28 100644
--- a/tr/aboutTor.dtd
+++ b/tr/aboutTor.dtd
@@ -47,8 +47,8 @@
 
   Thank you!
 -->
-
-
+
+
 
-
+

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

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

2021-10-21 Thread translation

commit 01eff61ac7ba93f2adc1c28d1a321fa1eae5a3dd
Author: Translation commit bot 
Date:   Fri Oct 22 04:17:41 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=support-portal_completed
---
 contents+tr.po | 51 +++
 1 file changed, 43 insertions(+), 8 deletions(-)

diff --git a/contents+tr.po b/contents+tr.po
index 0a3396abc8..66eeda9cea 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -4,8 +4,8 @@
 # 0d1bdb3b9a0d4e8f77bc854af8bf3dfc_e6913f4, 2020
 # T. E. Kalayci , 2021
 # erinm, 2021
-# Kaya Zeren , 2021
 # Emma Peel, 2021
+# Kaya Zeren , 2021
 # 
 msgid ""
 msgstr ""
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-21 10:31+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Emma Peel, 2021\n"
+"Last-Translator: Kaya Zeren , 2021\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1171,6 +1171,12 @@ msgid ""
 "public Tor network and related services, and assists in developing novel "
 "approaches to safe, privacy preserving data collection."
 msgstr ""
+"[Tor Metrics](https://metrics.torproject.org/) "
+"([.onion](http://hctxrvjzfpvmzh2jllqhgvvkoepxb4kfzdjm6h7egcwlumggtktiftid.onion/))"
+" Tor ekosistemi hakkÄ±ndaki geÃ§miÅ verileri arÅivleyerek ve herkese aÃ§Ä±k 
Tor "
+"aÄÄ±ndan ve iliÅkili hizmetlerden veri toplayarak, gÃ¼venli ve kiÅisel "
+"gizliliÄi koruyan veri toplamaya yÃ¶nelik yeni yaklaÅÄ±mlar 
geliÅtirilmesine "
+"yardÄ±mcÄ± olur."
 
 #: https//support.torproject.org/glossary/middle-relay/
 #: (content/glossary/middle-relay/contents+en.lrword.term)
@@ -2754,6 +2760,8 @@ msgid ""
 "- Unsafe: [Any other browser configured to use Tor as a "
 "proxy](../../tbb/tbb-9/)"
 msgstr ""
+"- GÃ¼vensiz: [Tor uygulamasÄ±nÄ± vekil sunucu olarak kullanacak Åekilde "
+"ayarlanmÄ±Å herhangi bir web tarayÄ±cÄ±sÄ±](../../tbb/tbb-9)"
 
 #: https//support.torproject.org/faq/staying-anonymous/
 #: (content/faq/staying-anonymous/contents+en.lrquestion.description)
@@ -3993,7 +4001,7 @@ msgstr ""
 #: https//support.torproject.org/about/key-management/
 #: (content/about/key-management/contents+en.lrquestion.description)
 msgid "### How do clients know what the directory authorities are?"
-msgstr ""
+msgstr "### MÃ¼Återiler, dizin belirleyicilerin ne olduÄunu nasÄ±l bilir?"
 
 #: https//support.torproject.org/about/key-management/
 #: (content/about/key-management/contents+en.lrquestion.description)
@@ -4016,7 +4024,7 @@ msgstr ""
 #: https//support.torproject.org/about/key-management/
 #: (content/about/key-management/contents+en.lrquestion.description)
 msgid "### How do users know they've got the right software?"
-msgstr ""
+msgstr "### KullanÄ±cÄ±lar doÄru yazÄ±lÄ±ma sahip olduklarÄ±nÄ± nasÄ±l 
anlayabilir?"
 
 #: https//support.torproject.org/about/key-management/
 #: (content/about/key-management/contents+en.lrquestion.description)
@@ -8895,6 +8903,10 @@ msgid ""
 " download](../../tbb/how-to-verify-signature/)), the fingerprint of the key "
 "used to make the signature, and the packageâs checksum."
 msgstr ""
+"GetTor hizmeti, Tor Browser paketini indirebileceÄiniz baÄlantÄ±lar, "
+"ÅifrelenmiÅ imza (indirmeyi 
[doÄrulamak](../../tbb/how-to-verify-signature/)"
+" iÃ§in), imzayÄ± oluÅturmak iÃ§in kullanÄ±lan parmak izi ve paketin saÄlama 
"
+"deÄerini iÃ§eren bir e-posta ile yanÄ±t verir."
 
 #: https//support.torproject.org/censorship/gettor-2/
 #: (content/censorship/gettor-2/contents+en.lrquestion.description)
@@ -8918,6 +8930,8 @@ msgid ""
 "GetTor via Twitter is currently under maintenance. Please use the "
 "[email](../gettor-2/) instead."
 msgstr ""
+"Twitter Ã¼zerinden kullanÄ±lan GetTor Åu anda bakÄ±mda. LÃ¼tfen onun yerine "
+"[e-posta](../gettor-2/) kullanÄ±n."
 
 #: https//support.torproject.org/censorship/how-can-i-use-snowflake/
 #: (content/censorship/how-can-i-use-snowflake/contents+en.lrquestion.title)
@@ -9090,6 +9104,8 @@ msgid ""
 "Snowflake is a [pluggable transport](../../glossary/pluggable-transports/) "
 "available in Tor Browser to defeat internet censorship."
 msgstr ""
+"Snowflake, Ä°nternet sansÃ¼rÃ¼nÃ¼ aÅmak iÃ§in Tor Browser Ã¼zerinde 
kullanÄ±labilen"
+" bir [deÄiÅtirilebilir 
taÅÄ±yÄ±cÄ±dÄ±r](../../glossary/pluggable-transports/)."
 
 #: https//support.torproject.org/censorship/what-is-snowflake/
 #: (content/censorship/what-is-snowflake/contents+en.lrquestion.description)
@@ -9127,6 +9143,10 @@ msgid ""
 "short-lived proxies on their regular browsers. Check, [how can I use "
 "Snowflake?](../how-can-i-use-snowflake/)"
 msgstr ""
+"SansÃ¼rlenen aÄlardaki kullanÄ±cÄ±lara yardÄ±m etmeye istekli gÃ¶nÃ¼llÃ¼ler, 
normal"
+" tarayÄ±cÄ±larÄ±nda kÄ±sa Ã¶mÃ¼rlÃ¼ vekil sunucular oluÅturarak yardÄ±mcÄ± "
+"olabilirler. [NasÄ±l Snowflake kullanabilirim?](../how-can-i-use-snowflake/) "
+"bÃ¶lÃ¼mÃ¼ne bakabilirsiniz"
 
 #:

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

2021-10-21 Thread translation

commit d9b9b2acb2dc5352b7391764f37acb6a7ab44800
Author: Translation commit bot 
Date:   Fri Oct 22 04:17:38 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+tr.po | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/contents+tr.po b/contents+tr.po
index 58c6d1679b..0b5e93ad3f 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -4,8 +4,8 @@
 # 0d1bdb3b9a0d4e8f77bc854af8bf3dfc_e6913f4, 2020
 # T. E. Kalayci , 2021
 # erinm, 2021
-# Kaya Zeren , 2021
 # Emma Peel, 2021
+# Kaya Zeren , 2021
 # 
 msgid ""
 msgstr ""
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-21 10:31+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Emma Peel, 2021\n"
+"Last-Translator: Kaya Zeren , 2021\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -628,6 +628,9 @@ msgid ""
 "Fore more information see this [blogpost about domain "
 "fronting](https://blog.torproject.org/domain-fronting-critical-open-web)."
 msgstr ""
+"AyrÄ±ntÄ±lÄ± bilgi almak iÃ§in [etki alanÄ± yÃ¼zÃ¼nÃ¼ deÄiÅtirmek 
hakkÄ±ndaki bu blog"
+" yazÄ±sÄ±na](https://blog.torproject.org/domain-fronting-critical-open-web) "
+"bakabilirsiniz."
 
 #: https//support.torproject.org/glossary/domain-fronting/
 #: (content/glossary/domain-fronting/contents+en.lrword.spelling)
@@ -4032,6 +4035,8 @@ msgid ""
 "When we distribute the source code or a package, we digitally sign it with "
 "[GNU Privacy Guard](https://www.gnupg.org/)."
 msgstr ""
+"Kaynak kodunu ya da bir paketi daÄÄ±tÄ±rken [GNU Privacy "
+"Guard](https://www.gnupg.org/) ile sayÄ±sal olarak imzalÄ±yoruz."
 
 #: https//support.torproject.org/about/key-management/
 #: (content/about/key-management/contents+en.lrquestion.description)
@@ -17805,8 +17810,7 @@ msgstr "KiÅisel gizlilik bir insan hakkÄ±dÄ±r"
 #: lego/templates/banner.html:15 templates/banner.html:15
 msgid "Your donation will be matched by Friends of Tor, up to $150,000."
 msgstr ""
-"Friends of Tor, $150.000 tutarÄ±nÄ± aÅmayan baÄÄ±ÅlarÄ±nÄ±z kadar katkÄ±da 
"
-"bulunacak."
+"Friends of Tor, $150.000 altÄ±nda yaptÄ±ÄÄ±nÄ±z baÄÄ±Å kadar katkÄ±da 
bulunacak."
 
 #: lego/templates/banner.html:26 templates/banner.html:26
 msgid "Your donation will be matched by Friends of Tor, up to $100,000."

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

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

2021-10-21 Thread translation

commit 8b62825d18720703971d478bcdb299ddacb6f6f6
Author: Translation commit bot 
Date:   Fri Oct 22 04:15:15 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot_completed
---
 contents+tr.po | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/contents+tr.po b/contents+tr.po
index 80c3c9b2bd..965760013c 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -10,8 +10,8 @@
 # T. E. Kalayci , 2021
 # escher , 2021
 # erinm, 2021
-# Kaya Zeren , 2021
 # Emma Peel, 2021
+# Kaya Zeren , 2021
 # 
 msgid ""
 msgstr ""
@@ -19,7 +19,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-21 11:36+CET\n"
 "PO-Revision-Date: 2019-12-11 10:50+\n"
-"Last-Translator: Emma Peel, 2021\n"
+"Last-Translator: Kaya Zeren , 2021\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20265,16 +20265,18 @@ msgid ""
 "Upgrading to the latest version of our image is as simple as pulling the "
 "latest version of the image running:"
 msgstr ""
+"Son kalÄ±p sÃ¼rÃ¼mÃ¼ne yÃ¼kseltmek, Ã§alÄ±Åan kalÄ±bÄ±n son sÃ¼rÃ¼mÃ¼nÃ¼ 
Ã§ekerek kolayca "
+"yapÄ±labilir:"
 
 #: https//community.torproject.org/relay/setup/bridge/docker/
 #: (content/relay/setup/bridge/docker/contents+en.lrpage.body)
 msgid "`docker-compose pull obfs4-bridge`"
-msgstr ""
+msgstr "`docker-compose pull obfs4-bridge`"
 
 #: https//community.torproject.org/relay/setup/bridge/docker/
 #: (content/relay/setup/bridge/docker/contents+en.lrpage.body)
 msgid "And then restarting the container:"
-msgstr ""
+msgstr "ArdÄ±ndan kapsayÄ±cÄ±yÄ± yeniden baÅlatÄ±n: "
 
 #: https//community.torproject.org/relay/setup/bridge/docker/
 #: (content/relay/setup/bridge/docker/contents+en.lrpage.body)
@@ -22538,11 +22540,12 @@ msgstr "AfiÅi kaldÄ±r"
 
 #: lego/templates/banner.html:11 templates/banner.html:11
 msgid "Privacy is a human right"
-msgstr ""
+msgstr "KiÅisel gizlilik bir insan hakkÄ±dÄ±r"
 
 #: lego/templates/banner.html:15 templates/banner.html:15
 msgid "Your donation will be matched by Friends of Tor, up to $150,000."
 msgstr ""
+"Friends of Tor, $150.000 altÄ±nda yaptÄ±ÄÄ±nÄ±z baÄÄ±Å kadar katkÄ±da 
bulunacak."
 
 #: lego/templates/banner.html:26 templates/banner.html:26
 msgid "Your donation will be matched by Friends of Tor, up to $100,000."
@@ -22552,7 +22555,7 @@ msgstr ""
 
 #: lego/templates/banner.html:32 templates/banner.html:32
 msgid "Donate now"
-msgstr ""
+msgstr "BaÄÄ±Å yapÄ±n"
 
 #: lego/templates/banner.html:34 templates/banner.html:34
 msgid "DONATE NOW"

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

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

2021-10-21 Thread translation

commit 3c2efae2061d12f4279f49d6778555ed1ef9be07
Author: Translation commit bot 
Date:   Fri Oct 22 04:15:11 2021 +


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

diff --git a/contents+tr.po b/contents+tr.po
index 4440254798..965760013c 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -10,8 +10,8 @@
 # T. E. Kalayci , 2021
 # escher , 2021
 # erinm, 2021
-# Kaya Zeren , 2021
 # Emma Peel, 2021
+# Kaya Zeren , 2021
 # 
 msgid ""
 msgstr ""
@@ -19,7 +19,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-21 11:36+CET\n"
 "PO-Revision-Date: 2019-12-11 10:50+\n"
-"Last-Translator: Emma Peel, 2021\n"
+"Last-Translator: Kaya Zeren , 2021\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20265,16 +20265,18 @@ msgid ""
 "Upgrading to the latest version of our image is as simple as pulling the "
 "latest version of the image running:"
 msgstr ""
+"Son kalÄ±p sÃ¼rÃ¼mÃ¼ne yÃ¼kseltmek, Ã§alÄ±Åan kalÄ±bÄ±n son sÃ¼rÃ¼mÃ¼nÃ¼ 
Ã§ekerek kolayca "
+"yapÄ±labilir:"
 
 #: https//community.torproject.org/relay/setup/bridge/docker/
 #: (content/relay/setup/bridge/docker/contents+en.lrpage.body)
 msgid "`docker-compose pull obfs4-bridge`"
-msgstr ""
+msgstr "`docker-compose pull obfs4-bridge`"
 
 #: https//community.torproject.org/relay/setup/bridge/docker/
 #: (content/relay/setup/bridge/docker/contents+en.lrpage.body)
 msgid "And then restarting the container:"
-msgstr ""
+msgstr "ArdÄ±ndan kapsayÄ±cÄ±yÄ± yeniden baÅlatÄ±n: "
 
 #: https//community.torproject.org/relay/setup/bridge/docker/
 #: (content/relay/setup/bridge/docker/contents+en.lrpage.body)
@@ -22543,8 +22545,7 @@ msgstr "KiÅisel gizlilik bir insan hakkÄ±dÄ±r"
 #: lego/templates/banner.html:15 templates/banner.html:15
 msgid "Your donation will be matched by Friends of Tor, up to $150,000."
 msgstr ""
-"Friends of Tor, $150.000 tutarÄ±nÄ± aÅmayan baÄÄ±ÅlarÄ±nÄ±z kadar katkÄ±da 
"
-"bulunacak."
+"Friends of Tor, $150.000 altÄ±nda yaptÄ±ÄÄ±nÄ±z baÄÄ±Å kadar katkÄ±da 
bulunacak."
 
 #: lego/templates/banner.html:26 templates/banner.html:26
 msgid "Your donation will be matched by Friends of Tor, up to $100,000."

___
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-10-21 Thread translation

commit 70733182cbef0c950b3ec0376762e06558bfe0a6
Author: Translation commit bot 
Date:   Fri Oct 22 01:15:45 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
---
 nb_NO/messages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nb_NO/messages.json b/nb_NO/messages.json
index 3157c5f145..6837621c0a 100644
--- a/nb_NO/messages.json
+++ b/nb_NO/messages.json
@@ -30,7 +30,7 @@
 "message": "PrÃ¸v igjen"
   },
   "popupRetrying": {
-"message": "Retrying ..."
+"message": "PrÃ¸ver igjen..."
   },
   "badgeCookiesOff": {
 "message": "Cookies are not enabled."

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

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

2021-10-21 Thread translation

commit afd9c1bbfd18c326db7f3ec13e1d8785b54d40e4
Author: Translation commit bot 
Date:   Thu Oct 21 20:47:23 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd
---
 pl/torbutton.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pl/torbutton.dtd b/pl/torbutton.dtd
index 0ad926f5d6..183b89a6c7 100644
--- a/pl/torbutton.dtd
+++ b/pl/torbutton.dtd
@@ -45,7 +45,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-10-21 Thread translation

commit 32a1f47a2f924e4dcb9d398e288f0ee72f626fdc
Author: Translation commit bot 
Date:   Thu Oct 21 20:17:42 2021 +

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

diff --git a/contents+ja.po b/contents+ja.po
index 551638fe6a..a2a9e0a367 100644
--- a/contents+ja.po
+++ b/contents+ja.po
@@ -12,9 +12,9 @@
 # D A , 2021
 # Kaede, 2021
 # erinm, 2021
-# Emma Peel, 2021
 # a  , 2021
 # h345u37g3 h345u37g3, 2021
+# Emma Peel, 2021
 # 
 msgid ""
 msgstr ""
@@ -22,7 +22,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-21 10:31+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: h345u37g3 h345u37g3, 2021\n"
+"Last-Translator: Emma Peel, 2021\n"
 "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14406,7 +14406,7 @@ msgstr "ãã©ã¤ãã·ã¼ã¯äººæ¨©ã§ã"
 
 #: lego/templates/banner.html:15 templates/banner.html:15
 msgid "Your donation will be matched by Friends of Tor, up to $150,000."
-msgstr ""
+msgstr 
"ããªããå¯ä»ããé¡ã¨åé¡ããTorã®ãã¼ããã¼ãå¯ä»ãã¾ã
 (æå¤§150,000ãã«)"
 
 #: lego/templates/banner.html:26 templates/banner.html:26
 msgid "Your donation will be matched by Friends of Tor, up to $100,000."

___
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-10-21 Thread translation

commit 0371301ed6a1f148d35cad0cbe05e3e400683b0c
Author: Translation commit bot 
Date:   Thu Oct 21 20:15:07 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed
---
 es-ES/aboutTor.dtd |  6 +++---
 ja/aboutTor.dtd| 28 
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/es-ES/aboutTor.dtd b/es-ES/aboutTor.dtd
index 21a5d00e97..491c547af5 100644
--- a/es-ES/aboutTor.dtd
+++ b/es-ES/aboutTor.dtd
@@ -47,8 +47,8 @@
 
   Thank you!
 -->
-
-
+
+
 
-
+
diff --git a/ja/aboutTor.dtd b/ja/aboutTor.dtd
index 8b41bbce3b..3ea7102ea5 100644
--- a/ja/aboutTor.dtd
+++ b/ja/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+

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

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

2021-10-21 Thread translation

commit a64980e00895733893e1a47190d523338b34bfe5
Author: Translation commit bot 
Date:   Thu Oct 21 20:15:16 2021 +


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

diff --git a/contents+ja.po b/contents+ja.po
index e5a371a81b..047b79e2c5 100644
--- a/contents+ja.po
+++ b/contents+ja.po
@@ -16,9 +16,9 @@
 # erinm, 2021
 # ue zaeco, 2021
 # XMPPã¯ããã, 2021
-# Emma Peel, 2021
 # kazushi3, 2021
 # h345u37g3 h345u37g3, 2021
+# Emma Peel, 2021
 # 
 msgid ""
 msgstr ""
@@ -26,7 +26,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-21 11:36+CET\n"
 "PO-Revision-Date: 2019-12-11 10:50+\n"
-"Last-Translator: h345u37g3 h345u37g3, 2021\n"
+"Last-Translator: Emma Peel, 2021\n"
 "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18548,7 +18548,7 @@ msgstr "ãã©ã¤ãã·ã¼ã¯äººæ¨©ã§ã"
 
 #: lego/templates/banner.html:15 templates/banner.html:15
 msgid "Your donation will be matched by Friends of Tor, up to $150,000."
-msgstr ""
+msgstr 
"ããªããå¯ä»ããé¡ã¨åé¡ããTorã®ãã¼ããã¼ãå¯ä»ãã¾ã
 (æå¤§150,000ãã«)"
 
 #: lego/templates/banner.html:26 templates/banner.html:26
 msgid "Your donation will be matched by Friends of Tor, up to $100,000."

___
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-10-21 Thread translation

commit ec0801570275f486c3695a31b17c8b623e8e59a7
Author: Translation commit bot 
Date:   Thu Oct 21 20:15:03 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
---
 id/aboutTor.dtd| 2 +-
 ja/aboutTor.dtd| 2 +-
 pt-BR/aboutTor.dtd | 2 +-
 ro/aboutTor.dtd| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/id/aboutTor.dtd b/id/aboutTor.dtd
index 18d9755a15..4918ea970c 100644
--- a/id/aboutTor.dtd
+++ b/id/aboutTor.dtd
@@ -47,7 +47,7 @@
 
   Thank you!
 -->
-
+
 
 
-
+
diff --git a/pt-BR/aboutTor.dtd b/pt-BR/aboutTor.dtd
index 0da300b72d..71aa234612 100644
--- a/pt-BR/aboutTor.dtd
+++ b/pt-BR/aboutTor.dtd
@@ -48,7 +48,7 @@
 
   Thank you!
 -->
-
+
 
 
-
+

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

2021-10-21 Thread translation

commit 0f076e29b38dcaa77513a0d878bff1031e77dca5
Author: Translation commit bot 
Date:   Thu Oct 21 18:48:14 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd_completed
---
 ar/torbutton.dtd| 1 +
 bn-BD/torbutton.dtd | 1 +
 ca/torbutton.dtd| 1 +
 cs/torbutton.dtd| 1 +
 da/torbutton.dtd| 1 +
 de/torbutton.dtd| 1 +
 el/torbutton.dtd| 1 +
 en-GB/torbutton.dtd | 1 +
 en-US/torbutton.dtd | 1 +
 en/torbutton.dtd| 1 +
 es-AR/torbutton.dtd | 1 +
 es-ES/torbutton.dtd | 1 +
 et/torbutton.dtd| 1 +
 fa/torbutton.dtd| 1 +
 fi/torbutton.dtd| 1 +
 fr/torbutton.dtd| 1 +
 ga-IE/torbutton.dtd | 1 +
 he/torbutton.dtd| 1 +
 hr/torbutton.dtd| 1 +
 hu/torbutton.dtd| 1 +
 id/torbutton.dtd| 1 +
 is/torbutton.dtd| 1 +
 it/torbutton.dtd| 1 +
 ja/torbutton.dtd| 1 +
 ka/torbutton.dtd| 1 +
 ko/torbutton.dtd| 1 +
 lt/torbutton.dtd| 1 +
 mk/torbutton.dtd| 1 +
 ms/torbutton.dtd| 1 +
 my/torbutton.dtd| 1 +
 nb-NO/torbutton.dtd | 1 +
 nl/torbutton.dtd| 1 +
 pl/torbutton.dtd| 1 +
 pt-BR/torbutton.dtd | 1 +
 pt-PT/torbutton.dtd | 1 +
 ro/torbutton.dtd| 1 +
 ru/torbutton.dtd| 1 +
 sk/torbutton.dtd| 1 +
 sv-SE/torbutton.dtd | 1 +
 ta/torbutton.dtd| 1 +
 tr/torbutton.dtd| 1 +
 uk/torbutton.dtd| 1 +
 zh-CN/torbutton.dtd | 1 +
 zh-TW/torbutton.dtd | 1 +
 44 files changed, 44 insertions(+)

diff --git a/ar/torbutton.dtd b/ar/torbutton.dtd
index bea3123a95..dac7f18c52 100644
--- a/ar/torbutton.dtd
+++ b/ar/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/bn-BD/torbutton.dtd b/bn-BD/torbutton.dtd
index a81f15ed33..74dc36da24 100644
--- a/bn-BD/torbutton.dtd
+++ b/bn-BD/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/ca/torbutton.dtd b/ca/torbutton.dtd
index 59bfaf7b0f..e5e5590bdf 100644
--- a/ca/torbutton.dtd
+++ b/ca/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/cs/torbutton.dtd b/cs/torbutton.dtd
index 56a7d534a2..c87f861fd7 100644
--- a/cs/torbutton.dtd
+++ b/cs/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/da/torbutton.dtd b/da/torbutton.dtd
index 6a4fb8aa1a..f3130c19c1 100644
--- a/da/torbutton.dtd
+++ b/da/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/de/torbutton.dtd b/de/torbutton.dtd
index 7265311d2c..68dbb8cfaf 100644
--- a/de/torbutton.dtd
+++ b/de/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/el/torbutton.dtd b/el/torbutton.dtd
index a81f15ed33..74dc36da24 100644
--- a/el/torbutton.dtd
+++ b/el/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/en-GB/torbutton.dtd b/en-GB/torbutton.dtd
index a81f15ed33..74dc36da24 100644
--- a/en-GB/torbutton.dtd
+++ b/en-GB/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/en-US/torbutton.dtd b/en-US/torbutton.dtd
index a81f15ed33..74dc36da24 100644
--- a/en-US/torbutton.dtd
+++ b/en-US/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/en/torbutton.dtd b/en/torbutton.dtd
index a81f15ed33..74dc36da24 100644
--- a/en/torbutton.dtd
+++ b/en/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/es-AR/torbutton.dtd b/es-AR/torbutton.dtd
index 795a71f118..a20a3759ae 100644
--- a/es-AR/torbutton.dtd
+++ b/es-AR/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/es-ES/torbutton.dtd b/es-ES/torbutton.dtd
index 73639e185f..f7f9280779 100644
--- a/es-ES/torbutton.dtd
+++ b/es-ES/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/et/torbutton.dtd b/et/torbutton.dtd
index a81f15ed33..74dc36da24 100644
--- a/et/torbutton.dtd
+++ b/et/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/fa/torbutton.dtd b/fa/torbutton.dtd
index a81f15ed33..74dc36da24 100644
--- a/fa/torbutton.dtd
+++ b/fa/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/fi/torbutton.dtd b/fi/torbutton.dtd
index 13bf8ac052..b571146130 100644
--- a/fi/torbutton.dtd
+++ b/fi/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/fr/torbutton.dtd b/fr/torbutton.dtd
index 6c60ae108e..15e96bb417 100644
--- a/fr/torbutton.dtd
+++ b/fr/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/ga-IE/torbutton.dtd b/ga-IE/torbutton.dtd
index 8cb1458bc6..38dddf5d05 100644
--- a/ga-IE/torbutton.dtd
+++ b/ga-IE/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/he/torbutton.dtd b/he/torbutton.dtd
index 5d88132918..9615d13572 100644
--- a/he/torbutton.dtd
+++ b/he/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/hr/torbutton.dtd b/hr/torbutton.dtd
index 59281ff98b..48b0419d25 100644
--- a/hr/torbutton.dtd
+++ b/hr/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/hu/torbutton.dtd b/hu/torbutton.dtd
index 69aa373df9..9464452b5e 100644
--- a/hu/torbutton.dtd
+++ b/hu/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/id/torbutton.dtd b/id/torbutton.dtd
index a81f15ed33..74dc36da24 100644
--- a/id/torbutton.dtd
+++ b/id/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/is/torbutton.dtd b/is/torbutton.dtd
index

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

2021-10-21 Thread translation

commit 69f6b98cc04a262881cba5acf2111974087f000a
Author: Translation commit bot 
Date:   Thu Oct 21 18:48:01 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd
---
 ach/torbutton.dtd   | 1 +
 af/torbutton.dtd| 1 +
 af_ZA/torbutton.dtd | 1 +
 ar/torbutton.dtd| 1 +
 ar_EG/torbutton.dtd | 1 +
 ast/torbutton.dtd   | 1 +
 az/torbutton.dtd| 1 +
 be/torbutton.dtd| 1 +
 bg/torbutton.dtd| 1 +
 bn-BD/torbutton.dtd | 1 +
 br/torbutton.dtd| 1 +
 bs/torbutton.dtd| 1 +
 ca/torbutton.dtd| 1 +
 cs/torbutton.dtd| 1 +
 cy/torbutton.dtd| 1 +
 da/torbutton.dtd| 1 +
 de/torbutton.dtd| 1 +
 el/torbutton.dtd| 1 +
 en-GB/torbutton.dtd | 1 +
 en-US/torbutton.dtd | 1 +
 en/torbutton.dtd| 1 +
 en_US/torbutton.dtd | 1 +
 eo/torbutton.dtd| 1 +
 es-AR/torbutton.dtd | 1 +
 es-ES/torbutton.dtd | 1 +
 es-MX/torbutton.dtd | 1 +
 et/torbutton.dtd| 1 +
 eu/torbutton.dtd| 1 +
 fa/torbutton.dtd| 1 +
 fi/torbutton.dtd| 1 +
 fr/torbutton.dtd| 1 +
 fr_FR/torbutton.dtd | 1 +
 fy-NL/torbutton.dtd | 1 +
 ga-IE/torbutton.dtd | 1 +
 gd/torbutton.dtd| 1 +
 gl/torbutton.dtd| 1 +
 gu-IN/torbutton.dtd | 1 +
 he/torbutton.dtd| 1 +
 hi-IN/torbutton.dtd | 1 +
 hr/torbutton.dtd| 1 +
 hu/torbutton.dtd| 1 +
 hy-AM/torbutton.dtd | 1 +
 ia/torbutton.dtd| 1 +
 id/torbutton.dtd| 1 +
 is/torbutton.dtd| 1 +
 it/torbutton.dtd| 1 +
 ja/torbutton.dtd| 1 +
 ka/torbutton.dtd| 1 +
 kab/torbutton.dtd   | 1 +
 kk/torbutton.dtd| 1 +
 km/torbutton.dtd| 1 +
 kn/torbutton.dtd| 1 +
 ko/torbutton.dtd| 1 +
 lt/torbutton.dtd| 1 +
 lv/torbutton.dtd| 1 +
 mk/torbutton.dtd| 1 +
 ml/torbutton.dtd| 1 +
 mr/torbutton.dtd| 1 +
 ms/torbutton.dtd| 1 +
 my/torbutton.dtd| 1 +
 nb-NO/torbutton.dtd | 1 +
 ne/torbutton.dtd| 1 +
 nl-BE/torbutton.dtd | 1 +
 nl/torbutton.dtd| 1 +
 nn-NO/torbutton.dtd | 1 +
 oc/torbutton.dtd| 1 +
 or/torbutton.dtd| 1 +
 pa-IN/torbutton.dtd | 1 +
 pl/torbutton.dtd| 1 +
 pt-BR/torbutton.dtd | 1 +
 pt-PT/torbutton.dtd | 1 +
 ro/torbutton.dtd| 1 +
 ro_RO/torbutton.dtd | 1 +
 ru/torbutton.dtd| 1 +
 si/torbutton.dtd| 1 +
 sk/torbutton.dtd| 1 +
 sl/torbutton.dtd| 1 +
 sl_SI/torbutton.dtd | 1 +
 son/torbutton.dtd   | 1 +
 sq/torbutton.dtd| 1 +
 sr/torbutton.dtd| 1 +
 sv-SE/torbutton.dtd | 1 +
 sw/torbutton.dtd| 1 +
 ta/torbutton.dtd| 1 +
 te/torbutton.dtd| 1 +
 th/torbutton.dtd| 1 +
 tr/torbutton.dtd| 1 +
 uk/torbutton.dtd| 1 +
 ur/torbutton.dtd| 1 +
 uz/torbutton.dtd| 1 +
 vi/torbutton.dtd| 1 +
 zh-CN/torbutton.dtd | 1 +
 zh-HK/torbutton.dtd | 1 +
 zh-TW/torbutton.dtd | 1 +
 zh/torbutton.dtd| 1 +
 95 files changed, 95 insertions(+)

diff --git a/ach/torbutton.dtd b/ach/torbutton.dtd
index b9ae0f0010..e5d56b64ae 100644
--- a/ach/torbutton.dtd
+++ b/ach/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/af/torbutton.dtd b/af/torbutton.dtd
index cb791e09a2..6c8ac66cf2 100644
--- a/af/torbutton.dtd
+++ b/af/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/af_ZA/torbutton.dtd b/af_ZA/torbutton.dtd
index b9ae0f0010..e5d56b64ae 100644
--- a/af_ZA/torbutton.dtd
+++ b/af_ZA/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/ar/torbutton.dtd b/ar/torbutton.dtd
index c5f101e5b5..471f5fac27 100644
--- a/ar/torbutton.dtd
+++ b/ar/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/ar_EG/torbutton.dtd b/ar_EG/torbutton.dtd
index b9ae0f0010..e5d56b64ae 100644
--- a/ar_EG/torbutton.dtd
+++ b/ar_EG/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/ast/torbutton.dtd b/ast/torbutton.dtd
index b9ae0f0010..e5d56b64ae 100644
--- a/ast/torbutton.dtd
+++ b/ast/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/az/torbutton.dtd b/az/torbutton.dtd
index 962e37eee0..ef5082c166 100644
--- a/az/torbutton.dtd
+++ b/az/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/be/torbutton.dtd b/be/torbutton.dtd
index 187e7c9243..bb39430e08 100644
--- a/be/torbutton.dtd
+++ b/be/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/bg/torbutton.dtd b/bg/torbutton.dtd
index 6b381020fb..6e7f165705 100644
--- a/bg/torbutton.dtd
+++ b/bg/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/bn-BD/torbutton.dtd b/bn-BD/torbutton.dtd
index 6e01a3f2b8..f9f4aa3171 100644
--- a/bn-BD/torbutton.dtd
+++ b/bn-BD/torbutton.dtd
@@ -46,6 +46,7 @@
 
 
 
+
 
 
 
diff --git a/br/torbutton.dtd b/br/torbutton.dtd
index 75b888e7b6..9cbcbc8b0a 100644
--- a/br/torbutton.dtd
+++ b/br/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/bs/torbutton.dtd b/bs/torbutton.dtd
index c9f16be2b2..3f79326e0f 100644
--- a/bs/torbutton.dtd
+++ b/bs/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git a/ca/torbutton.dtd b/ca/torbutton.dtd
index ac50edc519..fdd725cf10 100644
--- a/ca/torbutton.dtd
+++ b/ca/torbutton.dtd
@@ -45,6 +45,7 @@
 
 
 
+
 
 
 
diff --git

[tor-commits] [torbutton/maint-10.5] Translations update (for YEC)

2021-10-21 Thread sysrqb

commit 3bc2584d5c7ff4747195b194640b23abd0eba957
Author: Matthew Finkel 
Date:   Thu Oct 21 18:20:03 2021 +

Translations update (for YEC)
---
 chrome/locale/ar/aboutTor.dtd| 28 
 chrome/locale/bn-BD/aboutTor.dtd | 28 
 chrome/locale/ca/aboutTor.dtd| 28 
 chrome/locale/cs/aboutTor.dtd| 28 
 chrome/locale/da/aboutTor.dtd| 28 
 chrome/locale/de/aboutTor.dtd| 28 
 chrome/locale/el/aboutTor.dtd| 32 ++--
 chrome/locale/es-AR/aboutTor.dtd | 28 
 chrome/locale/es-ES/aboutTor.dtd | 28 
 chrome/locale/eu/aboutTor.dtd| 28 
 chrome/locale/fa/aboutTor.dtd| 28 
 chrome/locale/fr/aboutTor.dtd| 28 
 chrome/locale/ga-IE/aboutTor.dtd | 28 
 chrome/locale/he/aboutTor.dtd| 28 
 chrome/locale/hu/aboutTor.dtd| 28 
 chrome/locale/id/aboutTor.dtd| 28 
 chrome/locale/is/aboutTor.dtd| 28 
 chrome/locale/it/aboutTor.dtd| 28 
 chrome/locale/ja/aboutTor.dtd| 28 
 chrome/locale/ka/aboutTor.dtd| 28 
 chrome/locale/ko/aboutTor.dtd| 28 
 chrome/locale/lt/aboutTor.dtd| 28 
 chrome/locale/mk/aboutTor.dtd| 28 
 chrome/locale/ms/aboutTor.dtd| 28 
 chrome/locale/my/aboutTor.dtd| 28 
 chrome/locale/nb-NO/aboutTor.dtd | 28 
 chrome/locale/nl/aboutTor.dtd| 28 
 chrome/locale/pl/aboutTor.dtd| 28 
 chrome/locale/pt-BR/aboutTor.dtd | 28 
 chrome/locale/ro/aboutTor.dtd| 28 
 chrome/locale/ru/aboutTor.dtd| 28 
 chrome/locale/sv-SE/aboutTor.dtd | 30 +-
 chrome/locale/th/aboutTor.dtd| 28 
 chrome/locale/tr/aboutTor.dtd| 32 ++--
 chrome/locale/vi/aboutTor.dtd| 28 
 chrome/locale/zh-CN/aboutTor.dtd | 28 
 chrome/locale/zh-TW/aboutTor.dtd | 28 
 37 files changed, 1041 insertions(+), 5 deletions(-)

diff --git a/chrome/locale/ar/aboutTor.dtd b/chrome/locale/ar/aboutTor.dtd
index 00f2f913..60f87894 100644
--- a/chrome/locale/ar/aboutTor.dtd
+++ b/chrome/locale/ar/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/chrome/locale/bn-BD/aboutTor.dtd b/chrome/locale/bn-BD/aboutTor.dtd
index e52c4b7a..0808560c 100644
--- a/chrome/locale/bn-BD/aboutTor.dtd
+++ b/chrome/locale/bn-BD/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/chrome/locale/ca/aboutTor.dtd b/chrome/locale/ca/aboutTor.dtd
index 0741dd00..a566a3a9 100644
--- a/chrome/locale/ca/aboutTor.dtd
+++ b/chrome/locale/ca/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/chrome/locale/cs/aboutTor.dtd b/chrome/locale/cs/aboutTor.dtd
index 4a2a2e2b..2d5dd753 100644
--- a/chrome/locale/cs/aboutTor.dtd
+++ b/chrome/locale/cs/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/chrome/locale/da/aboutTor.dtd b/chrome/locale/da/aboutTor.dtd
index 09c87f8c..62a0faa8 100644
--- a/chrome/locale/da/aboutTor.dtd
+++ b/chrome/locale/da/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/chrome/locale/de/aboutTor.dtd b/chrome/locale/de/aboutTor.dtd
index 65f3834a..05c71121 100644
--- a/chrome/locale/de/aboutTor.dtd
+++ b/chrome/locale/de/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/chrome/locale/el/aboutTor.dtd b/chrome/locale/el/aboutTor.dtd
index 8d17ba12..a162ceaa 100644
--- a/chrome/locale/el/aboutTor.dtd
+++ b/chrome/locale/el/aboutTor.dtd
@@ -22,10 +22,38 @@
 
 
 
-
+
 
 
 
 
-
+
 
+
+
+
+
+
+
+
+
diff --git a/chrome/locale/es-AR/aboutTor.dtd b/chrome/locale/es-AR/aboutTor.dtd
index 0c4ebb64..df88805e 100644
--- a/chrome/locale/es-AR/aboutTor.dtd
+++ b/chrome/locale/es-AR/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/chrome/locale/es-ES/aboutTor.dtd b/chrome/locale/es-ES/aboutTor.dtd
index 0671a826..491c547a 100644
--- a/chrome/locale/es-ES/aboutTor.dtd
+++ b/chrome/locale/es-ES/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/chrome/locale/eu/aboutTor.dtd b/chrome/locale/eu/aboutTor.dtd
index b115af74..75ec4f0b 100644
--- a/chrome/locale/eu/aboutTor.dtd
+++ b/chrome/locale/eu/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git

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

2021-10-21 Thread translation

commit 8e7527b8c2897b7f8b9bc95bfd4d04c433e361ba
Author: Translation commit bot 
Date:   Thu Oct 21 17:45:03 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
---
 de/aboutTor.dtd | 2 +-
 el/aboutTor.dtd | 2 +-
 fr/aboutTor.dtd | 2 +-
 it/aboutTor.dtd | 2 +-
 ru/aboutTor.dtd | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/de/aboutTor.dtd b/de/aboutTor.dtd
index 05c711215d..b602df14e5 100644
--- a/de/aboutTor.dtd
+++ b/de/aboutTor.dtd
@@ -47,7 +47,7 @@
 
   Thank you!
 -->
-
+
 
 
-
+
 
 
-
+
 
 
-
+
 
 
-
+

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

2021-10-21 Thread translation

commit 04e5add9763ebc7109c3ed3961d43ba832d13900
Author: Translation commit bot 
Date:   Thu Oct 21 17:15:35 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed
---
 ar/aboutTor.dtd| 28 
 bn-BD/aboutTor.dtd | 28 
 cs/aboutTor.dtd| 28 
 da/aboutTor.dtd| 28 
 de/aboutTor.dtd| 28 
 el/aboutTor.dtd| 28 
 en-US/aboutTor.dtd | 28 
 en/aboutTor.dtd| 28 
 es-AR/aboutTor.dtd | 28 
 es-ES/aboutTor.dtd | 28 
 fr/aboutTor.dtd| 28 
 he/aboutTor.dtd| 28 
 hr/aboutTor.dtd| 28 
 hu/aboutTor.dtd| 28 
 id/aboutTor.dtd| 28 
 is/aboutTor.dtd| 28 
 it/aboutTor.dtd| 28 
 nl/aboutTor.dtd| 28 
 pl/aboutTor.dtd| 28 
 pt-BR/aboutTor.dtd | 28 
 pt-PT/aboutTor.dtd | 28 
 ro/aboutTor.dtd| 28 
 ru/aboutTor.dtd| 28 
 sv-SE/aboutTor.dtd | 28 
 th/aboutTor.dtd| 28 
 tr/aboutTor.dtd| 28 
 uk/aboutTor.dtd| 28 
 zh-CN/aboutTor.dtd | 28 
 28 files changed, 784 insertions(+)

diff --git a/ar/aboutTor.dtd b/ar/aboutTor.dtd
index 70d6b86e99..72e2a9cc16 100644
--- a/ar/aboutTor.dtd
+++ b/ar/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/bn-BD/aboutTor.dtd b/bn-BD/aboutTor.dtd
index 8b41bbce3b..3ea7102ea5 100644
--- a/bn-BD/aboutTor.dtd
+++ b/bn-BD/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/cs/aboutTor.dtd b/cs/aboutTor.dtd
index a86c4c0295..c8ef5ce834 100644
--- a/cs/aboutTor.dtd
+++ b/cs/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/da/aboutTor.dtd b/da/aboutTor.dtd
index 09c87f8c0f..9d8a139c54 100644
--- a/da/aboutTor.dtd
+++ b/da/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/de/aboutTor.dtd b/de/aboutTor.dtd
index 1e87c70d12..1c121d9dae 100644
--- a/de/aboutTor.dtd
+++ b/de/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/el/aboutTor.dtd b/el/aboutTor.dtd
index 8b41bbce3b..3ea7102ea5 100644
--- a/el/aboutTor.dtd
+++ b/el/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/en-US/aboutTor.dtd b/en-US/aboutTor.dtd
index 8b41bbce3b..3ea7102ea5 100644
--- a/en-US/aboutTor.dtd
+++ b/en-US/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/en/aboutTor.dtd b/en/aboutTor.dtd
index 8b41bbce3b..3ea7102ea5 100644
--- a/en/aboutTor.dtd
+++ b/en/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/es-AR/aboutTor.dtd b/es-AR/aboutTor.dtd
index 0c4ebb648a..fd213e713b 100644
--- a/es-AR/aboutTor.dtd
+++ b/es-AR/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/es-ES/aboutTor.dtd b/es-ES/aboutTor.dtd
index 0671a82629..21a5d00e97 100644
--- a/es-ES/aboutTor.dtd
+++ b/es-ES/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/fr/aboutTor.dtd b/fr/aboutTor.dtd
index 75b450048f..82ed7fe280 100644
--- a/fr/aboutTor.dtd
+++ b/fr/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/he/aboutTor.dtd b/he/aboutTor.dtd
index 520d773beb..816eb41bf6 100644
--- a/he/aboutTor.dtd
+++ b/he/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/hr/aboutTor.dtd b/hr/aboutTor.dtd
index 6590550e0e..02901dede9 100644
--- a/hr/aboutTor.dtd
+++ b/hr/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/hu/aboutTor.dtd b/hu/aboutTor.dtd
index 0ea0259939..35500d2b14 100644
--- a/hu/aboutTor.dtd
+++ b/hu/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/id/aboutTor.dtd b/id/aboutTor.dtd
index be1ecb0721..c4808890ef 100644
--- a/id/aboutTor.dtd
+++ b/id/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/is/aboutTor.dtd b/is/aboutTor.dtd
index 8b41bbce3b..3ea7102ea5 100644
--- a/is/aboutTor.dtd
+++ b/is/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/it/aboutTor.dtd b/it/aboutTor.dtd
index 34fe800631..b2481b275f 100644
--- a/it/aboutTor.dtd
+++ b/it/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/nl/aboutTor.dtd b/nl/aboutTor.dtd
index ca46073bf0..8e24bfe009 100644
--- a/nl/aboutTor.dtd
+++ b/nl/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/pl/aboutTor.dtd b/pl/aboutTor.dtd
index f93c56dd9d..601db663f8 100644
--- a/pl/aboutTor.dtd
+++ b/pl/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+

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

2021-10-21 Thread translation

commit 7f9665bb37e1056f2d316aaa3cebcbf0bd371be2
Author: Translation commit bot 
Date:   Thu Oct 21 17:15:19 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
---
 ar/aboutTor.dtd| 28 
 bg/aboutTor.dtd| 28 
 bn-BD/aboutTor.dtd | 28 
 ca/aboutTor.dtd| 28 
 cs/aboutTor.dtd| 28 
 cy/aboutTor.dtd| 28 
 da/aboutTor.dtd| 28 
 de/aboutTor.dtd| 28 
 el/aboutTor.dtd| 28 
 en-GB/aboutTor.dtd | 28 
 en-US/aboutTor.dtd | 28 
 en/aboutTor.dtd| 28 
 eo/aboutTor.dtd| 28 
 es-AR/aboutTor.dtd | 28 
 es-ES/aboutTor.dtd | 28 
 es-MX/aboutTor.dtd | 28 
 et/aboutTor.dtd| 28 
 eu/aboutTor.dtd| 28 
 fa/aboutTor.dtd| 28 
 fi/aboutTor.dtd| 28 
 fr/aboutTor.dtd| 28 
 ga-IE/aboutTor.dtd | 28 
 gl/aboutTor.dtd| 28 
 he/aboutTor.dtd| 28 
 hi-IN/aboutTor.dtd | 28 
 hr/aboutTor.dtd| 28 
 hu/aboutTor.dtd| 28 
 hy-AM/aboutTor.dtd | 28 
 id/aboutTor.dtd| 28 
 is/aboutTor.dtd| 28 
 it/aboutTor.dtd| 28 
 ja/aboutTor.dtd| 28 
 ka/aboutTor.dtd| 28 
 kk/aboutTor.dtd| 28 
 ko/aboutTor.dtd| 28 
 lt/aboutTor.dtd| 28 
 lv/aboutTor.dtd| 28 
 mk/aboutTor.dtd| 28 
 ml/aboutTor.dtd| 28 
 mr/aboutTor.dtd| 28 
 ms/aboutTor.dtd| 28 
 my/aboutTor.dtd| 28 
 nb-NO/aboutTor.dtd | 28 
 nl-BE/aboutTor.dtd | 28 
 nl/aboutTor.dtd| 28 
 nn-NO/aboutTor.dtd | 28 
 or/aboutTor.dtd| 28 
 pa-IN/aboutTor.dtd | 28 
 pl/aboutTor.dtd| 28 
 pt-BR/aboutTor.dtd | 28 
 pt-PT/aboutTor.dtd | 28 
 ro/aboutTor.dtd| 28 
 ru/aboutTor.dtd| 28 
 sk/aboutTor.dtd| 28 
 sl/aboutTor.dtd| 28 
 sq/aboutTor.dtd| 28 
 sr/aboutTor.dtd| 28 
 sv-SE/aboutTor.dtd | 28 
 sw/aboutTor.dtd| 28 
 ta/aboutTor.dtd| 28 
 th/aboutTor.dtd| 28 
 tr/aboutTor.dtd| 28 
 uk/aboutTor.dtd| 28 
 ur/aboutTor.dtd| 28 
 vi/aboutTor.dtd| 28 
 zh-CN/aboutTor.dtd | 28 
 zh-HK/aboutTor.dtd | 28 
 zh-TW/aboutTor.dtd | 28 
 68 files changed, 1904 insertions(+)

diff --git a/ar/aboutTor.dtd b/ar/aboutTor.dtd
index 00f2f913db..60f878946f 100644
--- a/ar/aboutTor.dtd
+++ b/ar/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/bg/aboutTor.dtd b/bg/aboutTor.dtd
index efde9b053e..42aacaf4b9 100644
--- a/bg/aboutTor.dtd
+++ b/bg/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/bn-BD/aboutTor.dtd b/bn-BD/aboutTor.dtd
index e52c4b7a02..0808560c6c 100644
--- a/bn-BD/aboutTor.dtd
+++ b/bn-BD/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/ca/aboutTor.dtd b/ca/aboutTor.dtd
index 0741dd0011..a566a3a9ed 100644
--- a/ca/aboutTor.dtd
+++ b/ca/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/cs/aboutTor.dtd b/cs/aboutTor.dtd
index 4a2a2e2b10..2d5dd753f5 100644
--- a/cs/aboutTor.dtd
+++ b/cs/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/cy/aboutTor.dtd b/cy/aboutTor.dtd
index f9597a2147..98ca0d8daf 100644
--- a/cy/aboutTor.dtd
+++ b/cy/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/da/aboutTor.dtd b/da/aboutTor.dtd
index

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

2021-10-21 Thread translation

commit 539fa41e2b6c7d6ad5a0226c73d1e34f09202655
Author: Translation commit bot 
Date:   Thu Oct 21 16:17:47 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+ar.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/contents+ar.po b/contents+ar.po
index ffc5713a3e..cfaa7d4169 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -14,8 +14,8 @@
 # erinm, 2021
 # William Ward , 2021
 # Ahmed A., 2021
-# NASIâ¿ , 2021
 # Emma Peel, 2021
+# NASIâ¿ , 2021
 # 
 msgid ""
 msgstr ""
@@ -23,7 +23,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-21 10:31+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Emma Peel, 2021\n"
+"Last-Translator: NASIâ¿ , 2021\n"
 "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1530,8 +1530,8 @@ msgid ""
 "[traffic](../traffic) manipulation on the internet."
 msgstr ""
 "OONI ÙÙ Ø§Ø®ØªØµØ§Ø± ÙÙ \"[Ø§ÙÙØ±ØµØ¯ Ø§ÙÙÙØªÙØ ÙØªØ¯Ø®Ù 
Ø§ÙØ´Ø¨ÙØ©](https://ooni.io/)\" Ø ÙÙÙ "
-"Ø´Ø¨ÙØ© ÙØ±Ø§ÙØ¨Ø© Ø¹Ø§ÙÙÙØ© ÙÙÙØ´Ù Ø¹Ù [Ø§ÙØ±ÙØ§Ø¨Ø©](../ Ù
Ø±Ø§ÙØ¨Ø© Ø§ÙØ´Ø¨ÙØ©) ÙØ§ÙÙØ±Ø§ÙØ¨Ø© Ù "
-"[Ø§ÙÙØ±ÙØ±](. . / Ø§ÙØªØ±Ø§ÙÙÙ) Ø§ÙØªÙØ§Ø¹Ø¨ Ø¹ÙÙ 
Ø§ÙØ¥ÙØªØ±ÙØª."
+"Ø´Ø¨ÙØ© ÙØ±Ø§ÙØ¨Ø© Ø¹Ø§ÙÙÙØ© ÙÙÙØ´Ù Ø¹Ù 
[Ø§ÙØ±ÙØ§Ø¨Ø©](../network-censorship) ÙØ§ÙÙØ±Ø§ÙØ¨Ø© Ù "
+"[Ø§ÙÙØ±ÙØ±](../traffic) Ø§ÙØªÙØ§Ø¹Ø¨ Ø¹ÙÙ Ø§ÙØ¥ÙØªØ±ÙØª."
 
 #: https//support.torproject.org/glossary/operating-system-os-/
 #: (content/glossary/operating-system-os-/contents+en.lrword.term)
@@ -16754,7 +16754,7 @@ msgstr "Ø³ÙØªÙ ÙØ·Ø§Ø¨ÙØ© ØªØ¨Ø±Ø¹Ù Ø¨ÙØ§Ø³Ø·Ø© 
Friends of Tor Ø ØØªÙ 1
 
 #: lego/templates/banner.html:32 templates/banner.html:32
 msgid "Donate now"
-msgstr ""
+msgstr "ØªØ¨Ø±Ø¹ Ø§ÙØ¢Ù"
 
 #: lego/templates/banner.html:34 templates/banner.html:34
 msgid "DONATE NOW"

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

[tor-commits] [chutney/main] Allow add_local_addrs = true to arti.toml

2021-10-21 Thread nickm

commit 6a12172d2e952f364a607c95760559fbffdb0b22
Author: Nick Mathewson 
Date:   Thu Oct 21 11:52:24 2021 -0400

Allow add_local_addrs = true to arti.toml
---
 lib/chutney/TorNet.py | 4 
 1 file changed, 4 insertions(+)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index ce3873a..53a8a6c 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -2370,6 +2370,10 @@ state_dir = "{path}/arti/state"
 # implements it.
 enforce_distance = {{ "subnets_family_v4" = 33, "subnets_family_v6" = 129 }}
 
+[client_config]
+# Allow the client to accept requests to connect to e.g. 127.0.0.1
+allow_local_addrs = true
+
 """.format(path=self.dir))
 f.write("""[network]
 fallback_caches = [

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

[tor-commits] [Git][tpo/applications/fenix] Pushed new tag tor-browser-91.2.0-10.5-2-build3

2021-10-21 Thread Matthew Finkel (@sysrqb)



Matthew Finkel pushed new tag tor-browser-91.2.0-10.5-2-build3 at The Tor 
Project / Applications / fenix

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-91.2.0-10.5-2-build3
You're receiving this email because of your account on gitlab.torproject.org.


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

[tor-commits] [tpo/master] i #244: update dgoulet about/people text

2021-10-21 Thread gus

commit aeec9de1849f99ffefe5c2a4a9f9fb6413229e8e
Author: HackerNCoder 
Date:   Thu Oct 21 15:01:01 2021 +

i #244: update dgoulet about/people text
---
 content/about/people/dgoulet/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/about/people/dgoulet/contents.lr 
b/content/about/people/dgoulet/contents.lr
index 80ecc2e8..6d582346 100644
--- a/content/about/people/dgoulet/contents.lr
+++ b/content/about/people/dgoulet/contents.lr
@@ -14,4 +14,4 @@ image: /static/images/people/dgoulet.png
 ---
 description:
 
-Tor development team focusing on onion services and our torsocks maintainer.
+Tor development. Member of the Network Team.

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

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

2021-10-21 Thread translation

commit e34527ebefc8f12c54cbea2ee7b88c1f3980241c
Author: Translation commit bot 
Date:   Thu Oct 21 15:15:11 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+ar.po | 22 --
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/contents+ar.po b/contents+ar.po
index f453e31267..b80fb68892 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -14,9 +14,9 @@
 # Ahmad Gharbeia , 2021
 # Layla Taha , 2021
 # erinm, 2021
-# NASIâ¿ , 2021
 # Emma Peel, 2021
 # Ahmed A., 2021
+# NASIâ¿ , 2021
 # 
 msgid ""
 msgstr ""
@@ -24,7 +24,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-21 11:36+CET\n"
 "PO-Revision-Date: 2019-12-11 10:50+\n"
-"Last-Translator: Ahmed A., 2021\n"
+"Last-Translator: NASIâ¿ , 2021\n"
 "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19657,6 +19657,7 @@ msgstr ""
 msgid ""
 "`sudo semanage port -a -t tor_port_t -p tcp [OR port set earlier, in TODO1]`"
 msgstr ""
+"`sudo semanage port -a -t tor_port_t -p tcp [OR port set earlier, in TODO1]`"
 
 #: https//community.torproject.org/relay/setup/bridge/centos-rhel-opensuse/
 #: (content/relay/setup/bridge/centos-rhel-opensuse/contents+en.lrpage.body)
@@ -19666,6 +19667,8 @@ msgid ""
 "`sudo semanage port -a -t tor_port_t -p tcp [obfs4 port set earlier, in "
 "TODO2]`"
 msgstr ""
+"`sudo semanage port -a -t tor_port_t -p tcp [obfs4 port set earlier, in "
+"TODO2]`"
 
 #: https//community.torproject.org/relay/setup/bridge/centos-rhel-opensuse/
 #: (content/relay/setup/bridge/centos-rhel-opensuse/contents+en.lrpage.body)
@@ -19689,7 +19692,7 @@ msgstr "ÙÙÙÙØ© ÙØ´Ø± Ø¬Ø³Ø± obfs4 Ø¹ÙÙ 
ÙÙØ¯ÙØ±Ø§"
 #: https//community.torproject.org/relay/setup/bridge/fedora/
 #: (content/relay/setup/bridge/fedora/contents+en.lrpage.body)
 msgid "Add the following to `/etc/yum.repos.d/tor.repo`"
-msgstr ""
+msgstr "Ø£Ø¶Ù ÙØ§ ÙÙÙ Ø¥ÙÙ `/etc/yum.repos.d/tor.repo`"
 
 #: https//community.torproject.org/relay/setup/bridge/fedora/
 #: (content/relay/setup/bridge/fedora/contents+en.lrpage.body)
@@ -20075,7 +20078,7 @@ msgstr ""
 #: https//community.torproject.org/relay/setup/guard/windows/
 #: (content/relay/setup/guard/windows/contents+en.lrpage.subtitle)
 msgid "How to deploy a middle/Guard relay on Windows"
-msgstr ""
+msgstr "ÙÙÙÙØ© ÙØ´Ø± ÙØ±ØÙ ÙØªÙØ³Ø·/ØØ§Ø±Ø³ Ø¹ÙÙ ÙÙÙØ¯ÙØ² "
 
 #: https//community.torproject.org/relay/setup/guard/windows/
 #: (content/relay/setup/guard/windows/contents+en.lrpage.body)
@@ -20139,6 +20142,8 @@ msgid ""
 "the bottom, select the small text that states \"I do not have this users "
 "sign-in information\"."
 msgstr ""
+"4. A Ø³ØªØ¸ÙØ± Ø§ÙÙÙØØ© Ø§ÙØ¢Ù ØªØ·ÙØ¨ ÙØ¹ÙÙÙØ§Øª ØØ³Ø§Ø¨ 
ÙÙÙØ¯ÙØ². ÙÙ Ø§ÙØ¬Ø²Ø¡ Ø§ÙØ³ÙÙÙØ ØØ¯Ø¯ Ø§ÙÙØµ "
+"Ø§ÙØµØºÙØ± Ø§ÙØ°Ù ÙÙØµ Ø¹ÙÙ \"ÙÙØ³ ÙØ¯Ù ÙØ¹ÙÙÙØ§Øª ØªØ³Ø¬ÙÙ 
Ø¯Ø®ÙÙ ÙØ¤ÙØ§Ø¡ Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙ\"."
 
 #: https//community.torproject.org/relay/setup/guard/windows/
 #: (content/relay/setup/guard/windows/contents+en.lrpage.body)
@@ -20146,6 +20151,8 @@ msgid ""
 "5. On the next panel, select the similar text on the bottom stating \"Set up"
 " user without using a Microsoft account\"."
 msgstr ""
+"5. ÙÙ Ø§ÙÙÙØØ© Ø§ÙØªØ§ÙÙØ©Ø ØØ¯Ø¯ Ø§ÙÙØµ Ø§ÙÙÙØ§Ø«Ù ÙÙ 
Ø§ÙØ¬Ø²Ø¡ Ø§ÙØ³ÙÙÙ Ø§ÙØ°Ù ÙØ´ÙØ± Ø¥ÙÙ \"Ø¥Ø¹Ø¯Ø§Ø¯"
+" Ø§ÙÙØ³ØªØ®Ø¯Ù Ø¯ÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù ØØ³Ø§Ø¨ ÙØ§ÙÙØ±ÙØ³ÙÙØª\"."
 
 #: https//community.torproject.org/relay/setup/guard/windows/
 #: (content/relay/setup/guard/windows/contents+en.lrpage.body)
@@ -20154,16 +20161,18 @@ msgid ""
 "this guide the username `torrelay` will  be used. Then enter a strong "
 "password and continue."
 msgstr ""
+"6. Ø£Ø¯Ø®Ù Ø§Ø³Ù ÙØ³ØªØ®Ø¯Ù ÙÙÙØ³ØªØ®Ø¯Ù. Ø£Ù Ø´ÙØ¡ ØªØ±ÙØ¯Ù 
Ø¬ÙØ¯Ø Ø¹ÙÙ Ø§ÙØ±ØºÙ ÙÙ Ø£ÙÙ Ø³ÙØªÙ Ø§Ø³ØªØ®Ø¯Ø§Ù"
+" Ø§Ø³Ù Ø§ÙÙØ³ØªØ®Ø¯Ù `torrelay` ÙÙ ÙØ°Ø§ Ø§ÙØ¯ÙÙÙ. Ø«Ù Ø£Ø¯Ø®Ù 
ÙÙÙØ© ÙØ±ÙØ± ÙÙÙØ© ÙØªØ§Ø¨Ø¹."
 
 #: https//community.torproject.org/relay/setup/guard/windows/
 #: (content/relay/setup/guard/windows/contents+en.lrpage.body)
 msgid "# 2. Downloading and configuring the Windows Expert bundle"
-msgstr ""
+msgstr "# 2. ØªÙØ²ÙÙ ØØ²ÙØ© Windows Expert ÙØªÙÙÙÙÙØ§"
 
 #: https//community.torproject.org/relay/setup/guard/windows/
 #: (content/relay/setup/guard/windows/contents+en.lrpage.body)
 msgid "## 2.1 Downloading"
-msgstr ""
+msgstr "## 2.1 Ø¬Ø§Ø±Ù Ø§ÙØªØÙÙÙ"
 
 #: https//community.torproject.org/relay/setup/guard/windows/
 #: (content/relay/setup/guard/windows/contents+en.lrpage.body)
@@ -20171,6 +20180,7 @@ msgid ""
 "The next step is to download and install Windows Expert bundle as well as "
 "set up your torrc file."
 msgstr ""
+"Ø§ÙØ®Ø·ÙØ© Ø§ÙØªØ§ÙÙØ© ÙÙ ØªÙØ²ÙÙ ØØ²ÙØ© Windows Expert 
ÙØªØ«Ø¨ÙØªÙØ§ ÙÙØ°ÙÙ Ø¥Ø¹Ø¯Ø§Ø¯ ÙÙÙ torrc."
 
 #:

[tor-commits] [Git][tpo/applications/fenix][tor-browser-91.2.0-10.5-2] fixup! Bug 40194 - Add 2021 YEC home screen

2021-10-21 Thread Matthew Finkel (@sysrqb)



Matthew Finkel pushed to branch tor-browser-91.2.0-10.5-2 at The Tor Project / 
Applications / fenix


Commits:
93db039b by Matthew Finkel at 2021-10-21T13:49:25+00:00
fixup! Bug 40194 - Add 2021 YEC home screen

- - - - -


1 changed file:

- app/src/main/res/values/colors.xml


Changes:

=
app/src/main/res/values/colors.xml
=
@@ -191,7 +191,7 @@
 @color/photonInk50
 @color/photonInk50
 
-#2A1B51
+@android:color/black
 
 
 @color/photonLightGrey05



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/fenix/-/commit/93db039bb6862fcba534dda8ab6d36bace0c7011

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/fenix/-/commit/93db039bb6862fcba534dda8ab6d36bace0c7011
You're receiving this email because of your account on gitlab.torproject.org.


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

[tor-commits] [torbutton/maint-10.5] Merge remote-tracking branch 'richardgl/40377_maint-10.5' into maint-10.5

2021-10-21 Thread sysrqb

commit 4b5a3bcb4f1fe7b55383c44adb2227745b55170a
Merge: 9dfac283 c5b54f86
Author: Matthew Finkel 
Date:   Thu Oct 21 14:38:42 2021 +

Merge remote-tracking branch 'richardgl/40377_maint-10.5' into maint-10.5

 LICENSE | 197 
 1 file changed, 197 insertions(+)

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

[tor-commits] [torbutton/maint-10.5] Bug 40055: Add licenses for Corben and Sniglet fonts used in YEC 2021 campaign

2021-10-21 Thread sysrqb

commit c5b54f86fce00fc3fb1188d70ac4cd99d6888086
Author: Richard Pospesel 
Date:   Wed Oct 20 17:07:54 2021 +0200

Bug 40055: Add licenses for Corben and Sniglet fonts used in YEC 2021 
campaign
---
 LICENSE | 197 
 1 file changed, 197 insertions(+)

diff --git a/LICENSE b/LICENSE
index 783d6a47..a8e43ed8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -27,3 +27,200 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
CONTRACT,
 STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
 IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
+
+===
+
+"Corben" font embedded in chrome/skin/corben-font.css is licensed under:
+
+Copyright (c) 2010, 2011 by vernon adams (v...@newtypography.co.uk),
+with Reserved Font Name Corben.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+---
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+---
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE

[tor-commits] [torbutton/master] Merge remote-tracking branch 'richardgl/40377'

2021-10-21 Thread sysrqb

commit 448a4fd28f2535554883c5989b616c9849eb4eba
Merge: 71e835f0 91c82ca3
Author: Matthew Finkel 
Date:   Thu Oct 21 14:37:10 2021 +

Merge remote-tracking branch 'richardgl/40377'

 LICENSE | 197 
 1 file changed, 197 insertions(+)

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

[tor-commits] [torbutton/master] Bug 40055: Add licenses for Corben and Sniglet fonts used in YEC 2021 campaign

2021-10-21 Thread sysrqb

commit 91c82ca361d489dbf98cba3852dba6733effd6b9
Author: Richard Pospesel 
Date:   Wed Oct 20 17:07:54 2021 +0200

Bug 40055: Add licenses for Corben and Sniglet fonts used in YEC 2021 
campaign
---
 LICENSE | 197 
 1 file changed, 197 insertions(+)

diff --git a/LICENSE b/LICENSE
index 783d6a47..a8e43ed8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -27,3 +27,200 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
CONTRACT,
 STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
 IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
+
+===
+
+"Corben" font embedded in chrome/skin/corben-font.css is licensed under:
+
+Copyright (c) 2010, 2011 by vernon adams (v...@newtypography.co.uk),
+with Reserved Font Name Corben.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+---
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+---
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE

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

2021-10-21 Thread dgoulet

commit d496a750266c777466f14639a76e43657dd68226
Merge: bd1c14f015 1dab1c8ad5
Author: David Goulet 
Date:   Thu Oct 21 10:01:38 2021 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6

 changes/ticket40493  |   2 +
 src/app/config/fallback_dirs.inc | 951 +++
 2 files changed, 472 insertions(+), 481 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.6] fallbackdir: Regenerate the list for October 2021

2021-10-21 Thread dgoulet

commit 66e8e0f71bfb55019b5fea1017d1be3b3dc13895
Author: David Goulet 
Date:   Thu Oct 21 09:13:40 2021 -0400

fallbackdir: Regenerate the list for October 2021

Closes #40493

Signed-off-by: David Goulet 
---
 changes/ticket40493  |   2 +
 src/app/config/fallback_dirs.inc | 951 +++
 2 files changed, 472 insertions(+), 481 deletions(-)

diff --git a/changes/ticket40493 b/changes/ticket40493
new file mode 100644
index 00..eb9baf916b
--- /dev/null
+++ b/changes/ticket40493
@@ -0,0 +1,2 @@
+  o Minor features (fallbackdir):
+- Regenerate fallback directories for October 2021. Close ticket 40493.
diff --git a/src/app/config/fallback_dirs.inc b/src/app/config/fallback_dirs.inc
index 75d01e26f8..ea1928e4c0 100644
--- a/src/app/config/fallback_dirs.inc
+++ b/src/app/config/fallback_dirs.inc
@@ -3,1086 +3,1075 @@
 /* timestamp=2021041200 */
 /* source=offer-list */
 //
-// Generated on: Wed, 11 Aug 2021 12:54:23 +
+// Generated on: Thu, 21 Oct 2021 13:07:39 +
 
-"46.126.96.8 orport=9001 id=2C74829C382C1363812FC2BF053122A9DCF6583B"
-/* nickname=ElNinoRelay */
+"62.210.105.46 orport=9001 id=ADB98B27D7A3FB5732068FD23602A1BCB3BE9F38"
+/* nickname=Assange008fr */
 /* extrainfo=0 */
 /* = */
 ,
-"85.214.141.24 orport=9001 id=BCC93B0ACA325374086A5100D02843A04EBDCC00"
-" ipv6=[2a01:238:420e:ae00:1c37:63c1:24c0:ff75]:9001"
-/* nickname=tor1VaxariNet */
+"95.128.43.164 orport=443 id=616081EC829593AF4232550DE6FFAA1D75B37A90"
+" ipv6=[2a02:ec0:209:10::4]:443"
+/* nickname=AquaRayTerminus */
 /* extrainfo=0 */
 /* = */
 ,
-"185.76.191.83 orport=443 id=1730E41B3B004479D4EF124B5364CC34CE86F4EA"
-/* nickname=x23tor83 */
+"5.79.79.133 orport=443 id=D079D6818926684C5979C18171FB18862A4A5792"
+/* nickname=beerbox */
 /* extrainfo=0 */
 /* = */
 ,
-"89.41.173.138 orport=443 id=B6942C63F1A596E6557D13FC0ACF8475A0A2AD3F"
-/* nickname=owin */
+"91.121.103.117 orport=9001 id=CA53F344DB85248D69A97E900A0EC3C31AC04D25"
+/* nickname=NoSuchRelay */
 /* extrainfo=0 */
 /* = */
 ,
-"142.4.213.88 orport=443 id=552FBD8FC8E7C5AC05FC6F8C960BDAF1081413B2"
-/* nickname=Unnamed */
+"109.70.100.9 orport=443 id=C8AE26D4819504D0157AD4C5DE7D5A0A7E190D10"
+" ipv6=[2a03:e600:100::9]:443"
+/* nickname=rucola */
 /* extrainfo=0 */
 /* = */
 ,
-"148.251.191.252 orport=443 id=56781CCC9F6D29FEA148799AB588429C893A473C"
-" ipv6=[2a01:4f8:211:d4f::2]:443"
-/* nickname=scurra */
+"83.205.231.204 orport=9001 id=E05CAC929E391787077066C29461A9D22ECF0809"
+/* nickname=albator */
 /* extrainfo=0 */
 /* = */
 ,
-"51.89.143.155 orport=443 id=A932F56F69D24A96A0CBC4F32922A62DEFD28C77"
-/* nickname=UenoStation55 */
+"37.252.187.111 orport=443 id=EE4AF632058F0734C1426B1AD689F47445CA2056"
+" ipv6=[2a00:63c1:c:111::2]:443"
+/* nickname=rinderwahnRelay7L */
 /* extrainfo=0 */
 /* = */
 ,
-"86.80.108.228 orport=9001 id=69497036653189531207746B3D0E4ECB56888F3C"
-/* nickname=octavsly */
+"144.76.157.242 orport=9001 id=00C22D3BC1822EB8EA380AF04245337399E796E2"
+" ipv6=[2a01:4f8:200:30f5::103]:9001"
+/* nickname=iriseden */
 /* extrainfo=0 */
 /* = */
 ,
-"54.37.232.61 orport=443 id=973B219FDAC30873212D866568B30C44D57B32E5"
-/* nickname=NikowskiThirdNode */
+"212.47.233.86 orport=9001 id=B4CAFD9CBFB34EC5DAAC146920DC7DFAFE91EA20"
+" ipv6=[2001:bc8:630:194::1]:9001"
+/* nickname=netimanmu */
 /* extrainfo=0 */
 /* = */
 ,
-"185.76.191.76 orport=443 id=837528CA94748B72CE1829E4E23A7EAB232C30E6"
-/* nickname=x23tor76 */
+"173.212.231.228 orport=9001 id=55403B9653A81F68C39787E000BD9F97E1F3B250"
+/* nickname=StriveForFreedom */
 /* extrainfo=0 */
 /* = */
 ,
-"45.140.170.187 orport=9001 id=A9B28E4D4FB6A26B5B6D3EDED2655D836BBD4E57"
-/* nickname=Assange011ruX */
+"62.216.54.29 orport=9001 id=16824F885D72B4FA7A5090E08D877E5404BC214D"
+/* nickname=guidemenow */
 /* extrainfo=0 */
 /* = */
 ,
-"81.83.37.138 orport=9001 id=B22A56D8AE494A20CA0EB8457F3CAC54FC99ACCE"
-" ipv6=[2a02:1810:38a2:d400:ba27:ebff:fec2:3e7e]:9001"
-/* nickname=Unnamed */
+"213.239.213.190 orport=443 id=4E98AA295B7171996D18DD1F6A19F64AB4036B4A"
+/* nickname=summalummadooma */
 /* extrainfo=0 */
 /* = */
 ,
-"82.64.163.188 orport=9001 id=4F95B7313679ECC000F38F870CF0CF39C7386C50"
-/* nickname=Ajorcel */
+"5.9.37.162 orport=9001 id=6C1A8CBE589906EEC6E73F4F286AC29AF7521E1D"
+" ipv6=[2a01:4f8:161:21a9::2]:9001"
+/* nickname=vahShei7Eeth */
 /* extrainfo=0 */
 /* = */
 ,
-"104.244.73.93 orport=9000 id=6183B493ACFF41B28745CF0322E75AD7BDE4A48B"
-" ipv6=[2605:6400:30:f73d:de71:a4eb:1b99:9545]:9000"
-/* nickname=Quetzalcoatl */
+"82.69.47.114 orport=443 id=43E896D36AAB20B5B63094BBC52CAD4B560E47BF"
+/* nickname=DeLoreanDynamite */
 /* extrainfo=0 */
 /* = */
 ,
-"194.38.21.10 orport=9001 id=690FC3ACBBBC970309A9A0993EE12AF44C0C8E62"
-/* nickname=Rowlet */
+"51.15.177.140 orport=993 id=ECD239A3B2CAD7375D218B624BCA270CDBFE2A29"
+" ipv6=[2001:bc8:3fec:500:7ea::]:993"
+/* nickname=Casper10 */
 /*

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

2021-10-21 Thread dgoulet

commit 2fdeeaa64d79c156b4bf68eadff4aedd5500a515
Merge: 5be41d420f d496a75026
Author: David Goulet 
Date:   Thu Oct 21 10:01:38 2021 -0400

Merge branch 'maint-0.4.6' into release-0.4.6

 changes/ticket40493  |   2 +
 src/app/config/fallback_dirs.inc | 951 +++
 2 files changed, 472 insertions(+), 481 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.6] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-10-21 Thread dgoulet

commit 1dab1c8ad5f398b3b634d7e9a121f5ca3efcbdc8
Merge: 0135fb028c 66e8e0f71b
Author: David Goulet 
Date:   Thu Oct 21 10:01:38 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5

 changes/ticket40493  |   2 +
 src/app/config/fallback_dirs.inc | 951 +++
 2 files changed, 472 insertions(+), 481 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.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

2021-10-21 Thread dgoulet

commit c0c34004993daebb4403bf095e2c853fc375b79a
Merge: 2a247f4255 66e8e0f71b
Author: David Goulet 
Date:   Thu Oct 21 10:01:38 2021 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

 changes/ticket40493  |   2 +
 src/app/config/fallback_dirs.inc | 951 +++
 2 files changed, 472 insertions(+), 481 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] fallbackdir: Regenerate the list for October 2021

2021-10-21 Thread dgoulet

commit 66e8e0f71bfb55019b5fea1017d1be3b3dc13895
Author: David Goulet 
Date:   Thu Oct 21 09:13:40 2021 -0400

fallbackdir: Regenerate the list for October 2021

Closes #40493

Signed-off-by: David Goulet 
---
 changes/ticket40493  |   2 +
 src/app/config/fallback_dirs.inc | 951 +++
 2 files changed, 472 insertions(+), 481 deletions(-)

diff --git a/changes/ticket40493 b/changes/ticket40493
new file mode 100644
index 00..eb9baf916b
--- /dev/null
+++ b/changes/ticket40493
@@ -0,0 +1,2 @@
+  o Minor features (fallbackdir):
+- Regenerate fallback directories for October 2021. Close ticket 40493.
diff --git a/src/app/config/fallback_dirs.inc b/src/app/config/fallback_dirs.inc
index 75d01e26f8..ea1928e4c0 100644
--- a/src/app/config/fallback_dirs.inc
+++ b/src/app/config/fallback_dirs.inc
@@ -3,1086 +3,1075 @@
 /* timestamp=2021041200 */
 /* source=offer-list */
 //
-// Generated on: Wed, 11 Aug 2021 12:54:23 +
+// Generated on: Thu, 21 Oct 2021 13:07:39 +
 
-"46.126.96.8 orport=9001 id=2C74829C382C1363812FC2BF053122A9DCF6583B"
-/* nickname=ElNinoRelay */
+"62.210.105.46 orport=9001 id=ADB98B27D7A3FB5732068FD23602A1BCB3BE9F38"
+/* nickname=Assange008fr */
 /* extrainfo=0 */
 /* = */
 ,
-"85.214.141.24 orport=9001 id=BCC93B0ACA325374086A5100D02843A04EBDCC00"
-" ipv6=[2a01:238:420e:ae00:1c37:63c1:24c0:ff75]:9001"
-/* nickname=tor1VaxariNet */
+"95.128.43.164 orport=443 id=616081EC829593AF4232550DE6FFAA1D75B37A90"
+" ipv6=[2a02:ec0:209:10::4]:443"
+/* nickname=AquaRayTerminus */
 /* extrainfo=0 */
 /* = */
 ,
-"185.76.191.83 orport=443 id=1730E41B3B004479D4EF124B5364CC34CE86F4EA"
-/* nickname=x23tor83 */
+"5.79.79.133 orport=443 id=D079D6818926684C5979C18171FB18862A4A5792"
+/* nickname=beerbox */
 /* extrainfo=0 */
 /* = */
 ,
-"89.41.173.138 orport=443 id=B6942C63F1A596E6557D13FC0ACF8475A0A2AD3F"
-/* nickname=owin */
+"91.121.103.117 orport=9001 id=CA53F344DB85248D69A97E900A0EC3C31AC04D25"
+/* nickname=NoSuchRelay */
 /* extrainfo=0 */
 /* = */
 ,
-"142.4.213.88 orport=443 id=552FBD8FC8E7C5AC05FC6F8C960BDAF1081413B2"
-/* nickname=Unnamed */
+"109.70.100.9 orport=443 id=C8AE26D4819504D0157AD4C5DE7D5A0A7E190D10"
+" ipv6=[2a03:e600:100::9]:443"
+/* nickname=rucola */
 /* extrainfo=0 */
 /* = */
 ,
-"148.251.191.252 orport=443 id=56781CCC9F6D29FEA148799AB588429C893A473C"
-" ipv6=[2a01:4f8:211:d4f::2]:443"
-/* nickname=scurra */
+"83.205.231.204 orport=9001 id=E05CAC929E391787077066C29461A9D22ECF0809"
+/* nickname=albator */
 /* extrainfo=0 */
 /* = */
 ,
-"51.89.143.155 orport=443 id=A932F56F69D24A96A0CBC4F32922A62DEFD28C77"
-/* nickname=UenoStation55 */
+"37.252.187.111 orport=443 id=EE4AF632058F0734C1426B1AD689F47445CA2056"
+" ipv6=[2a00:63c1:c:111::2]:443"
+/* nickname=rinderwahnRelay7L */
 /* extrainfo=0 */
 /* = */
 ,
-"86.80.108.228 orport=9001 id=69497036653189531207746B3D0E4ECB56888F3C"
-/* nickname=octavsly */
+"144.76.157.242 orport=9001 id=00C22D3BC1822EB8EA380AF04245337399E796E2"
+" ipv6=[2a01:4f8:200:30f5::103]:9001"
+/* nickname=iriseden */
 /* extrainfo=0 */
 /* = */
 ,
-"54.37.232.61 orport=443 id=973B219FDAC30873212D866568B30C44D57B32E5"
-/* nickname=NikowskiThirdNode */
+"212.47.233.86 orport=9001 id=B4CAFD9CBFB34EC5DAAC146920DC7DFAFE91EA20"
+" ipv6=[2001:bc8:630:194::1]:9001"
+/* nickname=netimanmu */
 /* extrainfo=0 */
 /* = */
 ,
-"185.76.191.76 orport=443 id=837528CA94748B72CE1829E4E23A7EAB232C30E6"
-/* nickname=x23tor76 */
+"173.212.231.228 orport=9001 id=55403B9653A81F68C39787E000BD9F97E1F3B250"
+/* nickname=StriveForFreedom */
 /* extrainfo=0 */
 /* = */
 ,
-"45.140.170.187 orport=9001 id=A9B28E4D4FB6A26B5B6D3EDED2655D836BBD4E57"
-/* nickname=Assange011ruX */
+"62.216.54.29 orport=9001 id=16824F885D72B4FA7A5090E08D877E5404BC214D"
+/* nickname=guidemenow */
 /* extrainfo=0 */
 /* = */
 ,
-"81.83.37.138 orport=9001 id=B22A56D8AE494A20CA0EB8457F3CAC54FC99ACCE"
-" ipv6=[2a02:1810:38a2:d400:ba27:ebff:fec2:3e7e]:9001"
-/* nickname=Unnamed */
+"213.239.213.190 orport=443 id=4E98AA295B7171996D18DD1F6A19F64AB4036B4A"
+/* nickname=summalummadooma */
 /* extrainfo=0 */
 /* = */
 ,
-"82.64.163.188 orport=9001 id=4F95B7313679ECC000F38F870CF0CF39C7386C50"
-/* nickname=Ajorcel */
+"5.9.37.162 orport=9001 id=6C1A8CBE589906EEC6E73F4F286AC29AF7521E1D"
+" ipv6=[2a01:4f8:161:21a9::2]:9001"
+/* nickname=vahShei7Eeth */
 /* extrainfo=0 */
 /* = */
 ,
-"104.244.73.93 orport=9000 id=6183B493ACFF41B28745CF0322E75AD7BDE4A48B"
-" ipv6=[2605:6400:30:f73d:de71:a4eb:1b99:9545]:9000"
-/* nickname=Quetzalcoatl */
+"82.69.47.114 orport=443 id=43E896D36AAB20B5B63094BBC52CAD4B560E47BF"
+/* nickname=DeLoreanDynamite */
 /* extrainfo=0 */
 /* = */
 ,
-"194.38.21.10 orport=9001 id=690FC3ACBBBC970309A9A0993EE12AF44C0C8E62"
-/* nickname=Rowlet */
+"51.15.177.140 orport=993 id=ECD239A3B2CAD7375D218B624BCA270CDBFE2A29"
+" ipv6=[2001:bc8:3fec:500:7ea::]:993"
+/* nickname=Casper10 */
 /*

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

2021-10-21 Thread dgoulet

commit f216fedb9e96c1f86c09ce359008fb0114e6d7cf
Merge: b98aad5be2 1dab1c8ad5
Author: David Goulet 
Date:   Thu Oct 21 10:01:38 2021 -0400

Merge branch 'maint-0.4.5' into release-0.4.5

 changes/ticket40493  |   2 +
 src/app/config/fallback_dirs.inc | 951 +++
 2 files changed, 472 insertions(+), 481 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] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-10-21 Thread dgoulet

commit 1dab1c8ad5f398b3b634d7e9a121f5ca3efcbdc8
Merge: 0135fb028c 66e8e0f71b
Author: David Goulet 
Date:   Thu Oct 21 10:01:38 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5

 changes/ticket40493  |   2 +
 src/app/config/fallback_dirs.inc | 951 +++
 2 files changed, 472 insertions(+), 481 deletions(-)



___
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.6] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-10-21 Thread dgoulet

commit d496a750266c777466f14639a76e43657dd68226
Merge: bd1c14f015 1dab1c8ad5
Author: David Goulet 
Date:   Thu Oct 21 10:01:38 2021 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6

 changes/ticket40493  |   2 +
 src/app/config/fallback_dirs.inc | 951 +++
 2 files changed, 472 insertions(+), 481 deletions(-)

___
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.6] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-10-21 Thread dgoulet

commit 1dab1c8ad5f398b3b634d7e9a121f5ca3efcbdc8
Merge: 0135fb028c 66e8e0f71b
Author: David Goulet 
Date:   Thu Oct 21 10:01:38 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5

 changes/ticket40493  |   2 +
 src/app/config/fallback_dirs.inc | 951 +++
 2 files changed, 472 insertions(+), 481 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.3.5] fallbackdir: Regenerate the list for October 2021

2021-10-21 Thread dgoulet

commit 66e8e0f71bfb55019b5fea1017d1be3b3dc13895
Author: David Goulet 
Date:   Thu Oct 21 09:13:40 2021 -0400

fallbackdir: Regenerate the list for October 2021

Closes #40493

Signed-off-by: David Goulet 
---
 changes/ticket40493  |   2 +
 src/app/config/fallback_dirs.inc | 951 +++
 2 files changed, 472 insertions(+), 481 deletions(-)

diff --git a/changes/ticket40493 b/changes/ticket40493
new file mode 100644
index 00..eb9baf916b
--- /dev/null
+++ b/changes/ticket40493
@@ -0,0 +1,2 @@
+  o Minor features (fallbackdir):
+- Regenerate fallback directories for October 2021. Close ticket 40493.
diff --git a/src/app/config/fallback_dirs.inc b/src/app/config/fallback_dirs.inc
index 75d01e26f8..ea1928e4c0 100644
--- a/src/app/config/fallback_dirs.inc
+++ b/src/app/config/fallback_dirs.inc
@@ -3,1086 +3,1075 @@
 /* timestamp=2021041200 */
 /* source=offer-list */
 //
-// Generated on: Wed, 11 Aug 2021 12:54:23 +
+// Generated on: Thu, 21 Oct 2021 13:07:39 +
 
-"46.126.96.8 orport=9001 id=2C74829C382C1363812FC2BF053122A9DCF6583B"
-/* nickname=ElNinoRelay */
+"62.210.105.46 orport=9001 id=ADB98B27D7A3FB5732068FD23602A1BCB3BE9F38"
+/* nickname=Assange008fr */
 /* extrainfo=0 */
 /* = */
 ,
-"85.214.141.24 orport=9001 id=BCC93B0ACA325374086A5100D02843A04EBDCC00"
-" ipv6=[2a01:238:420e:ae00:1c37:63c1:24c0:ff75]:9001"
-/* nickname=tor1VaxariNet */
+"95.128.43.164 orport=443 id=616081EC829593AF4232550DE6FFAA1D75B37A90"
+" ipv6=[2a02:ec0:209:10::4]:443"
+/* nickname=AquaRayTerminus */
 /* extrainfo=0 */
 /* = */
 ,
-"185.76.191.83 orport=443 id=1730E41B3B004479D4EF124B5364CC34CE86F4EA"
-/* nickname=x23tor83 */
+"5.79.79.133 orport=443 id=D079D6818926684C5979C18171FB18862A4A5792"
+/* nickname=beerbox */
 /* extrainfo=0 */
 /* = */
 ,
-"89.41.173.138 orport=443 id=B6942C63F1A596E6557D13FC0ACF8475A0A2AD3F"
-/* nickname=owin */
+"91.121.103.117 orport=9001 id=CA53F344DB85248D69A97E900A0EC3C31AC04D25"
+/* nickname=NoSuchRelay */
 /* extrainfo=0 */
 /* = */
 ,
-"142.4.213.88 orport=443 id=552FBD8FC8E7C5AC05FC6F8C960BDAF1081413B2"
-/* nickname=Unnamed */
+"109.70.100.9 orport=443 id=C8AE26D4819504D0157AD4C5DE7D5A0A7E190D10"
+" ipv6=[2a03:e600:100::9]:443"
+/* nickname=rucola */
 /* extrainfo=0 */
 /* = */
 ,
-"148.251.191.252 orport=443 id=56781CCC9F6D29FEA148799AB588429C893A473C"
-" ipv6=[2a01:4f8:211:d4f::2]:443"
-/* nickname=scurra */
+"83.205.231.204 orport=9001 id=E05CAC929E391787077066C29461A9D22ECF0809"
+/* nickname=albator */
 /* extrainfo=0 */
 /* = */
 ,
-"51.89.143.155 orport=443 id=A932F56F69D24A96A0CBC4F32922A62DEFD28C77"
-/* nickname=UenoStation55 */
+"37.252.187.111 orport=443 id=EE4AF632058F0734C1426B1AD689F47445CA2056"
+" ipv6=[2a00:63c1:c:111::2]:443"
+/* nickname=rinderwahnRelay7L */
 /* extrainfo=0 */
 /* = */
 ,
-"86.80.108.228 orport=9001 id=69497036653189531207746B3D0E4ECB56888F3C"
-/* nickname=octavsly */
+"144.76.157.242 orport=9001 id=00C22D3BC1822EB8EA380AF04245337399E796E2"
+" ipv6=[2a01:4f8:200:30f5::103]:9001"
+/* nickname=iriseden */
 /* extrainfo=0 */
 /* = */
 ,
-"54.37.232.61 orport=443 id=973B219FDAC30873212D866568B30C44D57B32E5"
-/* nickname=NikowskiThirdNode */
+"212.47.233.86 orport=9001 id=B4CAFD9CBFB34EC5DAAC146920DC7DFAFE91EA20"
+" ipv6=[2001:bc8:630:194::1]:9001"
+/* nickname=netimanmu */
 /* extrainfo=0 */
 /* = */
 ,
-"185.76.191.76 orport=443 id=837528CA94748B72CE1829E4E23A7EAB232C30E6"
-/* nickname=x23tor76 */
+"173.212.231.228 orport=9001 id=55403B9653A81F68C39787E000BD9F97E1F3B250"
+/* nickname=StriveForFreedom */
 /* extrainfo=0 */
 /* = */
 ,
-"45.140.170.187 orport=9001 id=A9B28E4D4FB6A26B5B6D3EDED2655D836BBD4E57"
-/* nickname=Assange011ruX */
+"62.216.54.29 orport=9001 id=16824F885D72B4FA7A5090E08D877E5404BC214D"
+/* nickname=guidemenow */
 /* extrainfo=0 */
 /* = */
 ,
-"81.83.37.138 orport=9001 id=B22A56D8AE494A20CA0EB8457F3CAC54FC99ACCE"
-" ipv6=[2a02:1810:38a2:d400:ba27:ebff:fec2:3e7e]:9001"
-/* nickname=Unnamed */
+"213.239.213.190 orport=443 id=4E98AA295B7171996D18DD1F6A19F64AB4036B4A"
+/* nickname=summalummadooma */
 /* extrainfo=0 */
 /* = */
 ,
-"82.64.163.188 orport=9001 id=4F95B7313679ECC000F38F870CF0CF39C7386C50"
-/* nickname=Ajorcel */
+"5.9.37.162 orport=9001 id=6C1A8CBE589906EEC6E73F4F286AC29AF7521E1D"
+" ipv6=[2a01:4f8:161:21a9::2]:9001"
+/* nickname=vahShei7Eeth */
 /* extrainfo=0 */
 /* = */
 ,
-"104.244.73.93 orport=9000 id=6183B493ACFF41B28745CF0322E75AD7BDE4A48B"
-" ipv6=[2605:6400:30:f73d:de71:a4eb:1b99:9545]:9000"
-/* nickname=Quetzalcoatl */
+"82.69.47.114 orport=443 id=43E896D36AAB20B5B63094BBC52CAD4B560E47BF"
+/* nickname=DeLoreanDynamite */
 /* extrainfo=0 */
 /* = */
 ,
-"194.38.21.10 orport=9001 id=690FC3ACBBBC970309A9A0993EE12AF44C0C8E62"
-/* nickname=Rowlet */
+"51.15.177.140 orport=993 id=ECD239A3B2CAD7375D218B624BCA270CDBFE2A29"
+" ipv6=[2001:bc8:3fec:500:7ea::]:993"
+/* nickname=Casper10 */
 /*

[tor-commits] [tor/maint-0.4.6] fallbackdir: Regenerate the list for October 2021

2021-10-21 Thread dgoulet

commit 66e8e0f71bfb55019b5fea1017d1be3b3dc13895
Author: David Goulet 
Date:   Thu Oct 21 09:13:40 2021 -0400

fallbackdir: Regenerate the list for October 2021

Closes #40493

Signed-off-by: David Goulet 
---
 changes/ticket40493  |   2 +
 src/app/config/fallback_dirs.inc | 951 +++
 2 files changed, 472 insertions(+), 481 deletions(-)

diff --git a/changes/ticket40493 b/changes/ticket40493
new file mode 100644
index 00..eb9baf916b
--- /dev/null
+++ b/changes/ticket40493
@@ -0,0 +1,2 @@
+  o Minor features (fallbackdir):
+- Regenerate fallback directories for October 2021. Close ticket 40493.
diff --git a/src/app/config/fallback_dirs.inc b/src/app/config/fallback_dirs.inc
index 75d01e26f8..ea1928e4c0 100644
--- a/src/app/config/fallback_dirs.inc
+++ b/src/app/config/fallback_dirs.inc
@@ -3,1086 +3,1075 @@
 /* timestamp=2021041200 */
 /* source=offer-list */
 //
-// Generated on: Wed, 11 Aug 2021 12:54:23 +
+// Generated on: Thu, 21 Oct 2021 13:07:39 +
 
-"46.126.96.8 orport=9001 id=2C74829C382C1363812FC2BF053122A9DCF6583B"
-/* nickname=ElNinoRelay */
+"62.210.105.46 orport=9001 id=ADB98B27D7A3FB5732068FD23602A1BCB3BE9F38"
+/* nickname=Assange008fr */
 /* extrainfo=0 */
 /* = */
 ,
-"85.214.141.24 orport=9001 id=BCC93B0ACA325374086A5100D02843A04EBDCC00"
-" ipv6=[2a01:238:420e:ae00:1c37:63c1:24c0:ff75]:9001"
-/* nickname=tor1VaxariNet */
+"95.128.43.164 orport=443 id=616081EC829593AF4232550DE6FFAA1D75B37A90"
+" ipv6=[2a02:ec0:209:10::4]:443"
+/* nickname=AquaRayTerminus */
 /* extrainfo=0 */
 /* = */
 ,
-"185.76.191.83 orport=443 id=1730E41B3B004479D4EF124B5364CC34CE86F4EA"
-/* nickname=x23tor83 */
+"5.79.79.133 orport=443 id=D079D6818926684C5979C18171FB18862A4A5792"
+/* nickname=beerbox */
 /* extrainfo=0 */
 /* = */
 ,
-"89.41.173.138 orport=443 id=B6942C63F1A596E6557D13FC0ACF8475A0A2AD3F"
-/* nickname=owin */
+"91.121.103.117 orport=9001 id=CA53F344DB85248D69A97E900A0EC3C31AC04D25"
+/* nickname=NoSuchRelay */
 /* extrainfo=0 */
 /* = */
 ,
-"142.4.213.88 orport=443 id=552FBD8FC8E7C5AC05FC6F8C960BDAF1081413B2"
-/* nickname=Unnamed */
+"109.70.100.9 orport=443 id=C8AE26D4819504D0157AD4C5DE7D5A0A7E190D10"
+" ipv6=[2a03:e600:100::9]:443"
+/* nickname=rucola */
 /* extrainfo=0 */
 /* = */
 ,
-"148.251.191.252 orport=443 id=56781CCC9F6D29FEA148799AB588429C893A473C"
-" ipv6=[2a01:4f8:211:d4f::2]:443"
-/* nickname=scurra */
+"83.205.231.204 orport=9001 id=E05CAC929E391787077066C29461A9D22ECF0809"
+/* nickname=albator */
 /* extrainfo=0 */
 /* = */
 ,
-"51.89.143.155 orport=443 id=A932F56F69D24A96A0CBC4F32922A62DEFD28C77"
-/* nickname=UenoStation55 */
+"37.252.187.111 orport=443 id=EE4AF632058F0734C1426B1AD689F47445CA2056"
+" ipv6=[2a00:63c1:c:111::2]:443"
+/* nickname=rinderwahnRelay7L */
 /* extrainfo=0 */
 /* = */
 ,
-"86.80.108.228 orport=9001 id=69497036653189531207746B3D0E4ECB56888F3C"
-/* nickname=octavsly */
+"144.76.157.242 orport=9001 id=00C22D3BC1822EB8EA380AF04245337399E796E2"
+" ipv6=[2a01:4f8:200:30f5::103]:9001"
+/* nickname=iriseden */
 /* extrainfo=0 */
 /* = */
 ,
-"54.37.232.61 orport=443 id=973B219FDAC30873212D866568B30C44D57B32E5"
-/* nickname=NikowskiThirdNode */
+"212.47.233.86 orport=9001 id=B4CAFD9CBFB34EC5DAAC146920DC7DFAFE91EA20"
+" ipv6=[2001:bc8:630:194::1]:9001"
+/* nickname=netimanmu */
 /* extrainfo=0 */
 /* = */
 ,
-"185.76.191.76 orport=443 id=837528CA94748B72CE1829E4E23A7EAB232C30E6"
-/* nickname=x23tor76 */
+"173.212.231.228 orport=9001 id=55403B9653A81F68C39787E000BD9F97E1F3B250"
+/* nickname=StriveForFreedom */
 /* extrainfo=0 */
 /* = */
 ,
-"45.140.170.187 orport=9001 id=A9B28E4D4FB6A26B5B6D3EDED2655D836BBD4E57"
-/* nickname=Assange011ruX */
+"62.216.54.29 orport=9001 id=16824F885D72B4FA7A5090E08D877E5404BC214D"
+/* nickname=guidemenow */
 /* extrainfo=0 */
 /* = */
 ,
-"81.83.37.138 orport=9001 id=B22A56D8AE494A20CA0EB8457F3CAC54FC99ACCE"
-" ipv6=[2a02:1810:38a2:d400:ba27:ebff:fec2:3e7e]:9001"
-/* nickname=Unnamed */
+"213.239.213.190 orport=443 id=4E98AA295B7171996D18DD1F6A19F64AB4036B4A"
+/* nickname=summalummadooma */
 /* extrainfo=0 */
 /* = */
 ,
-"82.64.163.188 orport=9001 id=4F95B7313679ECC000F38F870CF0CF39C7386C50"
-/* nickname=Ajorcel */
+"5.9.37.162 orport=9001 id=6C1A8CBE589906EEC6E73F4F286AC29AF7521E1D"
+" ipv6=[2a01:4f8:161:21a9::2]:9001"
+/* nickname=vahShei7Eeth */
 /* extrainfo=0 */
 /* = */
 ,
-"104.244.73.93 orport=9000 id=6183B493ACFF41B28745CF0322E75AD7BDE4A48B"
-" ipv6=[2605:6400:30:f73d:de71:a4eb:1b99:9545]:9000"
-/* nickname=Quetzalcoatl */
+"82.69.47.114 orport=443 id=43E896D36AAB20B5B63094BBC52CAD4B560E47BF"
+/* nickname=DeLoreanDynamite */
 /* extrainfo=0 */
 /* = */
 ,
-"194.38.21.10 orport=9001 id=690FC3ACBBBC970309A9A0993EE12AF44C0C8E62"
-/* nickname=Rowlet */
+"51.15.177.140 orport=993 id=ECD239A3B2CAD7375D218B624BCA270CDBFE2A29"
+" ipv6=[2001:bc8:3fec:500:7ea::]:993"
+/* nickname=Casper10 */
 /*

[tor-commits] [tor/maint-0.4.5] fallbackdir: Regenerate the list for October 2021

2021-10-21 Thread dgoulet

commit 66e8e0f71bfb55019b5fea1017d1be3b3dc13895
Author: David Goulet 
Date:   Thu Oct 21 09:13:40 2021 -0400

fallbackdir: Regenerate the list for October 2021

Closes #40493

Signed-off-by: David Goulet 
---
 changes/ticket40493  |   2 +
 src/app/config/fallback_dirs.inc | 951 +++
 2 files changed, 472 insertions(+), 481 deletions(-)

diff --git a/changes/ticket40493 b/changes/ticket40493
new file mode 100644
index 00..eb9baf916b
--- /dev/null
+++ b/changes/ticket40493
@@ -0,0 +1,2 @@
+  o Minor features (fallbackdir):
+- Regenerate fallback directories for October 2021. Close ticket 40493.
diff --git a/src/app/config/fallback_dirs.inc b/src/app/config/fallback_dirs.inc
index 75d01e26f8..ea1928e4c0 100644
--- a/src/app/config/fallback_dirs.inc
+++ b/src/app/config/fallback_dirs.inc
@@ -3,1086 +3,1075 @@
 /* timestamp=2021041200 */
 /* source=offer-list */
 //
-// Generated on: Wed, 11 Aug 2021 12:54:23 +
+// Generated on: Thu, 21 Oct 2021 13:07:39 +
 
-"46.126.96.8 orport=9001 id=2C74829C382C1363812FC2BF053122A9DCF6583B"
-/* nickname=ElNinoRelay */
+"62.210.105.46 orport=9001 id=ADB98B27D7A3FB5732068FD23602A1BCB3BE9F38"
+/* nickname=Assange008fr */
 /* extrainfo=0 */
 /* = */
 ,
-"85.214.141.24 orport=9001 id=BCC93B0ACA325374086A5100D02843A04EBDCC00"
-" ipv6=[2a01:238:420e:ae00:1c37:63c1:24c0:ff75]:9001"
-/* nickname=tor1VaxariNet */
+"95.128.43.164 orport=443 id=616081EC829593AF4232550DE6FFAA1D75B37A90"
+" ipv6=[2a02:ec0:209:10::4]:443"
+/* nickname=AquaRayTerminus */
 /* extrainfo=0 */
 /* = */
 ,
-"185.76.191.83 orport=443 id=1730E41B3B004479D4EF124B5364CC34CE86F4EA"
-/* nickname=x23tor83 */
+"5.79.79.133 orport=443 id=D079D6818926684C5979C18171FB18862A4A5792"
+/* nickname=beerbox */
 /* extrainfo=0 */
 /* = */
 ,
-"89.41.173.138 orport=443 id=B6942C63F1A596E6557D13FC0ACF8475A0A2AD3F"
-/* nickname=owin */
+"91.121.103.117 orport=9001 id=CA53F344DB85248D69A97E900A0EC3C31AC04D25"
+/* nickname=NoSuchRelay */
 /* extrainfo=0 */
 /* = */
 ,
-"142.4.213.88 orport=443 id=552FBD8FC8E7C5AC05FC6F8C960BDAF1081413B2"
-/* nickname=Unnamed */
+"109.70.100.9 orport=443 id=C8AE26D4819504D0157AD4C5DE7D5A0A7E190D10"
+" ipv6=[2a03:e600:100::9]:443"
+/* nickname=rucola */
 /* extrainfo=0 */
 /* = */
 ,
-"148.251.191.252 orport=443 id=56781CCC9F6D29FEA148799AB588429C893A473C"
-" ipv6=[2a01:4f8:211:d4f::2]:443"
-/* nickname=scurra */
+"83.205.231.204 orport=9001 id=E05CAC929E391787077066C29461A9D22ECF0809"
+/* nickname=albator */
 /* extrainfo=0 */
 /* = */
 ,
-"51.89.143.155 orport=443 id=A932F56F69D24A96A0CBC4F32922A62DEFD28C77"
-/* nickname=UenoStation55 */
+"37.252.187.111 orport=443 id=EE4AF632058F0734C1426B1AD689F47445CA2056"
+" ipv6=[2a00:63c1:c:111::2]:443"
+/* nickname=rinderwahnRelay7L */
 /* extrainfo=0 */
 /* = */
 ,
-"86.80.108.228 orport=9001 id=69497036653189531207746B3D0E4ECB56888F3C"
-/* nickname=octavsly */
+"144.76.157.242 orport=9001 id=00C22D3BC1822EB8EA380AF04245337399E796E2"
+" ipv6=[2a01:4f8:200:30f5::103]:9001"
+/* nickname=iriseden */
 /* extrainfo=0 */
 /* = */
 ,
-"54.37.232.61 orport=443 id=973B219FDAC30873212D866568B30C44D57B32E5"
-/* nickname=NikowskiThirdNode */
+"212.47.233.86 orport=9001 id=B4CAFD9CBFB34EC5DAAC146920DC7DFAFE91EA20"
+" ipv6=[2001:bc8:630:194::1]:9001"
+/* nickname=netimanmu */
 /* extrainfo=0 */
 /* = */
 ,
-"185.76.191.76 orport=443 id=837528CA94748B72CE1829E4E23A7EAB232C30E6"
-/* nickname=x23tor76 */
+"173.212.231.228 orport=9001 id=55403B9653A81F68C39787E000BD9F97E1F3B250"
+/* nickname=StriveForFreedom */
 /* extrainfo=0 */
 /* = */
 ,
-"45.140.170.187 orport=9001 id=A9B28E4D4FB6A26B5B6D3EDED2655D836BBD4E57"
-/* nickname=Assange011ruX */
+"62.216.54.29 orport=9001 id=16824F885D72B4FA7A5090E08D877E5404BC214D"
+/* nickname=guidemenow */
 /* extrainfo=0 */
 /* = */
 ,
-"81.83.37.138 orport=9001 id=B22A56D8AE494A20CA0EB8457F3CAC54FC99ACCE"
-" ipv6=[2a02:1810:38a2:d400:ba27:ebff:fec2:3e7e]:9001"
-/* nickname=Unnamed */
+"213.239.213.190 orport=443 id=4E98AA295B7171996D18DD1F6A19F64AB4036B4A"
+/* nickname=summalummadooma */
 /* extrainfo=0 */
 /* = */
 ,
-"82.64.163.188 orport=9001 id=4F95B7313679ECC000F38F870CF0CF39C7386C50"
-/* nickname=Ajorcel */
+"5.9.37.162 orport=9001 id=6C1A8CBE589906EEC6E73F4F286AC29AF7521E1D"
+" ipv6=[2a01:4f8:161:21a9::2]:9001"
+/* nickname=vahShei7Eeth */
 /* extrainfo=0 */
 /* = */
 ,
-"104.244.73.93 orport=9000 id=6183B493ACFF41B28745CF0322E75AD7BDE4A48B"
-" ipv6=[2605:6400:30:f73d:de71:a4eb:1b99:9545]:9000"
-/* nickname=Quetzalcoatl */
+"82.69.47.114 orport=443 id=43E896D36AAB20B5B63094BBC52CAD4B560E47BF"
+/* nickname=DeLoreanDynamite */
 /* extrainfo=0 */
 /* = */
 ,
-"194.38.21.10 orport=9001 id=690FC3ACBBBC970309A9A0993EE12AF44C0C8E62"
-/* nickname=Rowlet */
+"51.15.177.140 orport=993 id=ECD239A3B2CAD7375D218B624BCA270CDBFE2A29"
+" ipv6=[2001:bc8:3fec:500:7ea::]:993"
+/* nickname=Casper10 */
 /*

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

2021-10-21 Thread dgoulet

commit d496a750266c777466f14639a76e43657dd68226
Merge: bd1c14f015 1dab1c8ad5
Author: David Goulet 
Date:   Thu Oct 21 10:01:38 2021 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6

 changes/ticket40493  |   2 +
 src/app/config/fallback_dirs.inc | 951 +++
 2 files changed, 472 insertions(+), 481 deletions(-)



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

[tor-commits] [tor/main] fallbackdir: Regenerate the list for October 2021

2021-10-21 Thread dgoulet

commit 66e8e0f71bfb55019b5fea1017d1be3b3dc13895
Author: David Goulet 
Date:   Thu Oct 21 09:13:40 2021 -0400

fallbackdir: Regenerate the list for October 2021

Closes #40493

Signed-off-by: David Goulet 
---
 changes/ticket40493  |   2 +
 src/app/config/fallback_dirs.inc | 951 +++
 2 files changed, 472 insertions(+), 481 deletions(-)

diff --git a/changes/ticket40493 b/changes/ticket40493
new file mode 100644
index 00..eb9baf916b
--- /dev/null
+++ b/changes/ticket40493
@@ -0,0 +1,2 @@
+  o Minor features (fallbackdir):
+- Regenerate fallback directories for October 2021. Close ticket 40493.
diff --git a/src/app/config/fallback_dirs.inc b/src/app/config/fallback_dirs.inc
index 75d01e26f8..ea1928e4c0 100644
--- a/src/app/config/fallback_dirs.inc
+++ b/src/app/config/fallback_dirs.inc
@@ -3,1086 +3,1075 @@
 /* timestamp=2021041200 */
 /* source=offer-list */
 //
-// Generated on: Wed, 11 Aug 2021 12:54:23 +
+// Generated on: Thu, 21 Oct 2021 13:07:39 +
 
-"46.126.96.8 orport=9001 id=2C74829C382C1363812FC2BF053122A9DCF6583B"
-/* nickname=ElNinoRelay */
+"62.210.105.46 orport=9001 id=ADB98B27D7A3FB5732068FD23602A1BCB3BE9F38"
+/* nickname=Assange008fr */
 /* extrainfo=0 */
 /* = */
 ,
-"85.214.141.24 orport=9001 id=BCC93B0ACA325374086A5100D02843A04EBDCC00"
-" ipv6=[2a01:238:420e:ae00:1c37:63c1:24c0:ff75]:9001"
-/* nickname=tor1VaxariNet */
+"95.128.43.164 orport=443 id=616081EC829593AF4232550DE6FFAA1D75B37A90"
+" ipv6=[2a02:ec0:209:10::4]:443"
+/* nickname=AquaRayTerminus */
 /* extrainfo=0 */
 /* = */
 ,
-"185.76.191.83 orport=443 id=1730E41B3B004479D4EF124B5364CC34CE86F4EA"
-/* nickname=x23tor83 */
+"5.79.79.133 orport=443 id=D079D6818926684C5979C18171FB18862A4A5792"
+/* nickname=beerbox */
 /* extrainfo=0 */
 /* = */
 ,
-"89.41.173.138 orport=443 id=B6942C63F1A596E6557D13FC0ACF8475A0A2AD3F"
-/* nickname=owin */
+"91.121.103.117 orport=9001 id=CA53F344DB85248D69A97E900A0EC3C31AC04D25"
+/* nickname=NoSuchRelay */
 /* extrainfo=0 */
 /* = */
 ,
-"142.4.213.88 orport=443 id=552FBD8FC8E7C5AC05FC6F8C960BDAF1081413B2"
-/* nickname=Unnamed */
+"109.70.100.9 orport=443 id=C8AE26D4819504D0157AD4C5DE7D5A0A7E190D10"
+" ipv6=[2a03:e600:100::9]:443"
+/* nickname=rucola */
 /* extrainfo=0 */
 /* = */
 ,
-"148.251.191.252 orport=443 id=56781CCC9F6D29FEA148799AB588429C893A473C"
-" ipv6=[2a01:4f8:211:d4f::2]:443"
-/* nickname=scurra */
+"83.205.231.204 orport=9001 id=E05CAC929E391787077066C29461A9D22ECF0809"
+/* nickname=albator */
 /* extrainfo=0 */
 /* = */
 ,
-"51.89.143.155 orport=443 id=A932F56F69D24A96A0CBC4F32922A62DEFD28C77"
-/* nickname=UenoStation55 */
+"37.252.187.111 orport=443 id=EE4AF632058F0734C1426B1AD689F47445CA2056"
+" ipv6=[2a00:63c1:c:111::2]:443"
+/* nickname=rinderwahnRelay7L */
 /* extrainfo=0 */
 /* = */
 ,
-"86.80.108.228 orport=9001 id=69497036653189531207746B3D0E4ECB56888F3C"
-/* nickname=octavsly */
+"144.76.157.242 orport=9001 id=00C22D3BC1822EB8EA380AF04245337399E796E2"
+" ipv6=[2a01:4f8:200:30f5::103]:9001"
+/* nickname=iriseden */
 /* extrainfo=0 */
 /* = */
 ,
-"54.37.232.61 orport=443 id=973B219FDAC30873212D866568B30C44D57B32E5"
-/* nickname=NikowskiThirdNode */
+"212.47.233.86 orport=9001 id=B4CAFD9CBFB34EC5DAAC146920DC7DFAFE91EA20"
+" ipv6=[2001:bc8:630:194::1]:9001"
+/* nickname=netimanmu */
 /* extrainfo=0 */
 /* = */
 ,
-"185.76.191.76 orport=443 id=837528CA94748B72CE1829E4E23A7EAB232C30E6"
-/* nickname=x23tor76 */
+"173.212.231.228 orport=9001 id=55403B9653A81F68C39787E000BD9F97E1F3B250"
+/* nickname=StriveForFreedom */
 /* extrainfo=0 */
 /* = */
 ,
-"45.140.170.187 orport=9001 id=A9B28E4D4FB6A26B5B6D3EDED2655D836BBD4E57"
-/* nickname=Assange011ruX */
+"62.216.54.29 orport=9001 id=16824F885D72B4FA7A5090E08D877E5404BC214D"
+/* nickname=guidemenow */
 /* extrainfo=0 */
 /* = */
 ,
-"81.83.37.138 orport=9001 id=B22A56D8AE494A20CA0EB8457F3CAC54FC99ACCE"
-" ipv6=[2a02:1810:38a2:d400:ba27:ebff:fec2:3e7e]:9001"
-/* nickname=Unnamed */
+"213.239.213.190 orport=443 id=4E98AA295B7171996D18DD1F6A19F64AB4036B4A"
+/* nickname=summalummadooma */
 /* extrainfo=0 */
 /* = */
 ,
-"82.64.163.188 orport=9001 id=4F95B7313679ECC000F38F870CF0CF39C7386C50"
-/* nickname=Ajorcel */
+"5.9.37.162 orport=9001 id=6C1A8CBE589906EEC6E73F4F286AC29AF7521E1D"
+" ipv6=[2a01:4f8:161:21a9::2]:9001"
+/* nickname=vahShei7Eeth */
 /* extrainfo=0 */
 /* = */
 ,
-"104.244.73.93 orport=9000 id=6183B493ACFF41B28745CF0322E75AD7BDE4A48B"
-" ipv6=[2605:6400:30:f73d:de71:a4eb:1b99:9545]:9000"
-/* nickname=Quetzalcoatl */
+"82.69.47.114 orport=443 id=43E896D36AAB20B5B63094BBC52CAD4B560E47BF"
+/* nickname=DeLoreanDynamite */
 /* extrainfo=0 */
 /* = */
 ,
-"194.38.21.10 orport=9001 id=690FC3ACBBBC970309A9A0993EE12AF44C0C8E62"
-/* nickname=Rowlet */
+"51.15.177.140 orport=993 id=ECD239A3B2CAD7375D218B624BCA270CDBFE2A29"
+" ipv6=[2001:bc8:3fec:500:7ea::]:993"
+/* nickname=Casper10 */
 /*

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

2021-10-21 Thread dgoulet

commit 1dab1c8ad5f398b3b634d7e9a121f5ca3efcbdc8
Merge: 0135fb028c 66e8e0f71b
Author: David Goulet 
Date:   Thu Oct 21 10:01:38 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5

 changes/ticket40493  |   2 +
 src/app/config/fallback_dirs.inc | 951 +++
 2 files changed, 472 insertions(+), 481 deletions(-)

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

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

2021-10-21 Thread dgoulet

commit 1dab1c8ad5f398b3b634d7e9a121f5ca3efcbdc8
Merge: 0135fb028c 66e8e0f71b
Author: David Goulet 
Date:   Thu Oct 21 10:01:38 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5

 changes/ticket40493  |   2 +
 src/app/config/fallback_dirs.inc | 951 +++
 2 files changed, 472 insertions(+), 481 deletions(-)



___
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] fallbackdir: Regenerate the list for October 2021

2021-10-21 Thread dgoulet

commit 66e8e0f71bfb55019b5fea1017d1be3b3dc13895
Author: David Goulet 
Date:   Thu Oct 21 09:13:40 2021 -0400

fallbackdir: Regenerate the list for October 2021

Closes #40493

Signed-off-by: David Goulet 
---
 changes/ticket40493  |   2 +
 src/app/config/fallback_dirs.inc | 951 +++
 2 files changed, 472 insertions(+), 481 deletions(-)

diff --git a/changes/ticket40493 b/changes/ticket40493
new file mode 100644
index 00..eb9baf916b
--- /dev/null
+++ b/changes/ticket40493
@@ -0,0 +1,2 @@
+  o Minor features (fallbackdir):
+- Regenerate fallback directories for October 2021. Close ticket 40493.
diff --git a/src/app/config/fallback_dirs.inc b/src/app/config/fallback_dirs.inc
index 75d01e26f8..ea1928e4c0 100644
--- a/src/app/config/fallback_dirs.inc
+++ b/src/app/config/fallback_dirs.inc
@@ -3,1086 +3,1075 @@
 /* timestamp=2021041200 */
 /* source=offer-list */
 //
-// Generated on: Wed, 11 Aug 2021 12:54:23 +
+// Generated on: Thu, 21 Oct 2021 13:07:39 +
 
-"46.126.96.8 orport=9001 id=2C74829C382C1363812FC2BF053122A9DCF6583B"
-/* nickname=ElNinoRelay */
+"62.210.105.46 orport=9001 id=ADB98B27D7A3FB5732068FD23602A1BCB3BE9F38"
+/* nickname=Assange008fr */
 /* extrainfo=0 */
 /* = */
 ,
-"85.214.141.24 orport=9001 id=BCC93B0ACA325374086A5100D02843A04EBDCC00"
-" ipv6=[2a01:238:420e:ae00:1c37:63c1:24c0:ff75]:9001"
-/* nickname=tor1VaxariNet */
+"95.128.43.164 orport=443 id=616081EC829593AF4232550DE6FFAA1D75B37A90"
+" ipv6=[2a02:ec0:209:10::4]:443"
+/* nickname=AquaRayTerminus */
 /* extrainfo=0 */
 /* = */
 ,
-"185.76.191.83 orport=443 id=1730E41B3B004479D4EF124B5364CC34CE86F4EA"
-/* nickname=x23tor83 */
+"5.79.79.133 orport=443 id=D079D6818926684C5979C18171FB18862A4A5792"
+/* nickname=beerbox */
 /* extrainfo=0 */
 /* = */
 ,
-"89.41.173.138 orport=443 id=B6942C63F1A596E6557D13FC0ACF8475A0A2AD3F"
-/* nickname=owin */
+"91.121.103.117 orport=9001 id=CA53F344DB85248D69A97E900A0EC3C31AC04D25"
+/* nickname=NoSuchRelay */
 /* extrainfo=0 */
 /* = */
 ,
-"142.4.213.88 orport=443 id=552FBD8FC8E7C5AC05FC6F8C960BDAF1081413B2"
-/* nickname=Unnamed */
+"109.70.100.9 orport=443 id=C8AE26D4819504D0157AD4C5DE7D5A0A7E190D10"
+" ipv6=[2a03:e600:100::9]:443"
+/* nickname=rucola */
 /* extrainfo=0 */
 /* = */
 ,
-"148.251.191.252 orport=443 id=56781CCC9F6D29FEA148799AB588429C893A473C"
-" ipv6=[2a01:4f8:211:d4f::2]:443"
-/* nickname=scurra */
+"83.205.231.204 orport=9001 id=E05CAC929E391787077066C29461A9D22ECF0809"
+/* nickname=albator */
 /* extrainfo=0 */
 /* = */
 ,
-"51.89.143.155 orport=443 id=A932F56F69D24A96A0CBC4F32922A62DEFD28C77"
-/* nickname=UenoStation55 */
+"37.252.187.111 orport=443 id=EE4AF632058F0734C1426B1AD689F47445CA2056"
+" ipv6=[2a00:63c1:c:111::2]:443"
+/* nickname=rinderwahnRelay7L */
 /* extrainfo=0 */
 /* = */
 ,
-"86.80.108.228 orport=9001 id=69497036653189531207746B3D0E4ECB56888F3C"
-/* nickname=octavsly */
+"144.76.157.242 orport=9001 id=00C22D3BC1822EB8EA380AF04245337399E796E2"
+" ipv6=[2a01:4f8:200:30f5::103]:9001"
+/* nickname=iriseden */
 /* extrainfo=0 */
 /* = */
 ,
-"54.37.232.61 orport=443 id=973B219FDAC30873212D866568B30C44D57B32E5"
-/* nickname=NikowskiThirdNode */
+"212.47.233.86 orport=9001 id=B4CAFD9CBFB34EC5DAAC146920DC7DFAFE91EA20"
+" ipv6=[2001:bc8:630:194::1]:9001"
+/* nickname=netimanmu */
 /* extrainfo=0 */
 /* = */
 ,
-"185.76.191.76 orport=443 id=837528CA94748B72CE1829E4E23A7EAB232C30E6"
-/* nickname=x23tor76 */
+"173.212.231.228 orport=9001 id=55403B9653A81F68C39787E000BD9F97E1F3B250"
+/* nickname=StriveForFreedom */
 /* extrainfo=0 */
 /* = */
 ,
-"45.140.170.187 orport=9001 id=A9B28E4D4FB6A26B5B6D3EDED2655D836BBD4E57"
-/* nickname=Assange011ruX */
+"62.216.54.29 orport=9001 id=16824F885D72B4FA7A5090E08D877E5404BC214D"
+/* nickname=guidemenow */
 /* extrainfo=0 */
 /* = */
 ,
-"81.83.37.138 orport=9001 id=B22A56D8AE494A20CA0EB8457F3CAC54FC99ACCE"
-" ipv6=[2a02:1810:38a2:d400:ba27:ebff:fec2:3e7e]:9001"
-/* nickname=Unnamed */
+"213.239.213.190 orport=443 id=4E98AA295B7171996D18DD1F6A19F64AB4036B4A"
+/* nickname=summalummadooma */
 /* extrainfo=0 */
 /* = */
 ,
-"82.64.163.188 orport=9001 id=4F95B7313679ECC000F38F870CF0CF39C7386C50"
-/* nickname=Ajorcel */
+"5.9.37.162 orport=9001 id=6C1A8CBE589906EEC6E73F4F286AC29AF7521E1D"
+" ipv6=[2a01:4f8:161:21a9::2]:9001"
+/* nickname=vahShei7Eeth */
 /* extrainfo=0 */
 /* = */
 ,
-"104.244.73.93 orport=9000 id=6183B493ACFF41B28745CF0322E75AD7BDE4A48B"
-" ipv6=[2605:6400:30:f73d:de71:a4eb:1b99:9545]:9000"
-/* nickname=Quetzalcoatl */
+"82.69.47.114 orport=443 id=43E896D36AAB20B5B63094BBC52CAD4B560E47BF"
+/* nickname=DeLoreanDynamite */
 /* extrainfo=0 */
 /* = */
 ,
-"194.38.21.10 orport=9001 id=690FC3ACBBBC970309A9A0993EE12AF44C0C8E62"
-/* nickname=Rowlet */
+"51.15.177.140 orport=993 id=ECD239A3B2CAD7375D218B624BCA270CDBFE2A29"
+" ipv6=[2001:bc8:3fec:500:7ea::]:993"
+/* nickname=Casper10 */
 /*

[tor-commits] [tor/main] Merge branch 'maint-0.4.6'

2021-10-21 Thread dgoulet

commit 2f171f30c8fdcf968ea304d48c42db9fbd0efdf4
Merge: ae05f06597 d496a75026
Author: David Goulet 
Date:   Thu Oct 21 10:01:39 2021 -0400

Merge branch 'maint-0.4.6'

 changes/ticket40493  |   2 +
 src/app/config/fallback_dirs.inc | 951 +++
 2 files changed, 472 insertions(+), 481 deletions(-)

___
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-10-21 Thread translation

commit 938b5e50a92b644f3456b63bfb2389639ea451b5
Author: Translation commit bot 
Date:   Thu Oct 21 13:17:46 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
---
 contents+ja.po | 25 ++---
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/contents+ja.po b/contents+ja.po
index 0906c5c784..109376cb8b 100644
--- a/contents+ja.po
+++ b/contents+ja.po
@@ -10,10 +10,10 @@
 # c7a0a66e0476db158663636124cfb54f_370a183, 2020
 # Gus, 2020
 # h345u37g3 h345u37g3, 2021
-# Ito Takeshi, 2021
 # Kaede, 2021
 # D A , 2021
 # erinm, 2021
+# Ito Takeshi, 2021
 # 
 msgid ""
 msgstr ""
@@ -21,7 +21,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-08 13:14+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: erinm, 2021\n"
+"Last-Translator: Ito Takeshi, 2021\n"
 "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -204,7 +204,7 @@ msgstr "æ´å²"
 #: https//www.torproject.org/privchat/
 #: (content/privchat/contents+en.lrpage.title)
 msgid "PrivChat"
-msgstr ""
+msgstr "PrivChat"
 
 #: https//www.torproject.org/download/alpha/
 #: (content/download/alpha/contents+en.lrpage.title)
@@ -242,6 +242,9 @@ msgid ""
 "add more. Want to help us translate? [See "
 "here](https://community.torproject.org/localization/)"
 msgstr ""
+"èª°ããèªåã®è¨èªã§ Tor Browser 
ãä½¿ãããã¨ãæãã§ãã¾ããTor Browser ã¯ç¾å¨ 36 "
+"ã®è¨èªã§å©ç¨å¯è½ã§ãããã«ä½¿ããè¨èªãå¢ãããã¨æ´»åãã¦ãã¾ããç¿»è¨³ãæä¼ãããã§ãã?
 "
+"[ãã¡ãããç¢ºèªãã 
ãã](https://community.torproject.org/localization/)"
 
 #: https//www.torproject.org/download/tor/
 #: (content/download/tor/contents+en.lrpage.title)
@@ -678,12 +681,12 @@ msgstr ""
 #: https//www.torproject.org/releases/tor-browser-10-5/
 #: (content/releases/tor-browser-10-5/contents+en.lrpage.title)
 msgid "Tor Browser 10.5"
-msgstr ""
+msgstr "Tor Browser 10.5"
 
 #: https//www.torproject.org/releases/tor-browser-10-5/
 #: (content/releases/tor-browser-10-5/contents+en.lrpage.body)
 msgid "## New Release: Tor Browser 10.5"
-msgstr ""
+msgstr "## æ°ãããªãªã¼ã¹: Tor Browser 10.5"
 
 #: https//www.torproject.org/releases/tor-browser-10-5/
 #: (content/releases/tor-browser-10-5/contents+en.lrpage.body)
@@ -714,12 +717,12 @@ msgstr ""
 #: https//www.torproject.org/releases/tor-browser-10-5/
 #: (content/releases/tor-browser-10-5/contents+en.lrpage.body)
 msgid "### What's new?"
-msgstr ""
+msgstr "### æ°æ©è½"
 
 #: https//www.torproject.org/releases/tor-browser-10-5/
 #: (content/releases/tor-browser-10-5/contents+en.lrpage.body)
 msgid " V2 Onion Services Deprecation"
-msgstr ""
+msgstr " V2 Onion ãµã¼ãã¹ã®éæ¨å¥¨"
 
 #: https//www.torproject.org/releases/tor-browser-10-5/
 #: (content/releases/tor-browser-10-5/contents+en.lrpage.body)
@@ -739,7 +742,7 @@ msgstr ""
 #: https//www.torproject.org/releases/tor-browser-10-5/
 #: (content/releases/tor-browser-10-5/contents+en.lrpage.body)
 msgid " Snowflake is now available as a bridge"
-msgstr ""
+msgstr " Snowflake ãããªãã¸ã¨ãã¦å©ç¨å¯è½ã«"
 
 #: https//www.torproject.org/releases/tor-browser-10-5/
 #: (content/releases/tor-browser-10-5/contents+en.lrpage.body)
@@ -821,7 +824,7 @@ msgstr ""
 #: https//www.torproject.org/releases/tor-browser-10-5/
 #: (content/releases/tor-browser-10-5/contents+en.lrpage.body)
 msgid " Known Issues"
-msgstr ""
+msgstr " æ¢ç¥ã®åé¡"
 
 #: https//www.torproject.org/releases/tor-browser-10-5/
 #: (content/releases/tor-browser-10-5/contents+en.lrpage.body)
@@ -889,7 +892,7 @@ msgstr ""
 #: https//www.torproject.org/releases/tor-browser-10-5/
 #: (content/releases/tor-browser-10-5/contents+en.lrpage.body)
 msgid " Give Feedback"
-msgstr ""
+msgstr " ãã£ã¼ãããã¯ãæä¾"
 
 #: https//www.torproject.org/releases/tor-browser-10-0/
 #: (content/releases/tor-browser-10-0/contents+en.lrpage.title)
@@ -970,7 +973,7 @@ msgstr ""
 #: https//www.torproject.org/releases/tor-browser-10-0/
 #: (content/releases/tor-browser-10-0/contents+en.lrpage.body)
 msgid "Beginning with the 10.5 series, CentOS 6 is not supported."
-msgstr ""
+msgstr "10.5 ç³»åããã¯ CentOS 6 ã¯ãµãã¼ãããã¾ããã"
 
 #: https//www.torproject.org/about/cy-pres/
 #: (content/about/cy-pres/contents+en.lrpage.title)

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

[tor-commits] [tor/main] Implement a MiddleOnly flag for vote generation.

2021-10-21 Thread ahf

commit fc542167cb568fc3805275e2405990423cf87e3b
Author: Nick Mathewson 
Date:   Fri Oct 8 11:14:53 2021 -0400

Implement a MiddleOnly flag for vote generation.

This proposal implements part of Prop335; it's based on a patch
from Neel Chauhan.

When configured to do so, authorities will assign a MiddleOnly flag
to certain relays.  Any relay which an authority gives this flag
will not get Exit, V2Dir, Guard, or HSDir, and might get BadExit if
the authority votes for that one.
---
 src/app/config/config.c |  3 +++
 src/app/config/or_options_st.h  |  4 
 src/core/or/policies.c  | 22 ++
 src/core/or/policies.h  |  1 +
 src/feature/dirauth/dirauth_options.inc |  4 
 src/feature/dirauth/dirvote.c   | 11 ---
 src/feature/dirauth/process_descs.c | 15 +++
 src/feature/dirauth/process_descs.h |  3 ++-
 src/feature/dirauth/voteflags.c | 11 ++-
 src/feature/dirauth/voteflags.h |  3 ++-
 src/feature/dirparse/ns_parse.c |  2 ++
 src/feature/nodelist/fmt_routerstatus.c |  3 ++-
 src/feature/nodelist/node_st.h  |  2 ++
 src/feature/nodelist/routerstatus_st.h  |  2 ++
 src/test/test_voting_flags.c|  3 ++-
 15 files changed, 81 insertions(+), 8 deletions(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index 15b4585954..8df5275cc6 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -193,6 +193,7 @@ static const config_abbrev_t option_abbrevs_[] = {
   PLURAL(AuthDirBadDirCC),
   PLURAL(AuthDirBadExitCC),
   PLURAL(AuthDirInvalidCC),
+  PLURAL(AuthDirMiddleOnlyCC),
   PLURAL(AuthDirRejectCC),
   PLURAL(EntryNode),
   PLURAL(ExcludeNode),
@@ -331,6 +332,8 @@ static const config_var_t option_vars_[] = {
   V(AuthDirBadExitCCs,   CSV,  ""),
   V(AuthDirInvalid,  LINELIST, NULL),
   V(AuthDirInvalidCCs,   CSV,  ""),
+  V(AuthDirMiddleOnly,   LINELIST, NULL),
+  V(AuthDirMiddleOnlyCCs,CSV,  ""),
   V(AuthDirReject,   LINELIST, NULL),
   V(AuthDirRejectCCs,CSV,  ""),
   OBSOLETE("AuthDirRejectUnlisted"),
diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h
index 812fa92cae..3a1acad044 100644
--- a/src/app/config/or_options_st.h
+++ b/src/app/config/or_options_st.h
@@ -499,6 +499,9 @@ struct or_options_t {
   struct smartlist_t *NodeFamilySets;
   struct config_line_t *AuthDirBadExit; /**< Address policy for descriptors to
   * mark as bad exits. */
+  /** Address policy for descriptors to mark as only suitable for the
+   * middle position in circuits. */
+  struct config_line_t *AuthDirMiddleOnly;
   struct config_line_t *AuthDirReject; /**< Address policy for descriptors to
  * reject. */
   struct config_line_t *AuthDirInvalid; /**< Address policy for descriptors to
@@ -512,6 +515,7 @@ struct or_options_t {
*/
   struct smartlist_t *AuthDirBadExitCCs;
   struct smartlist_t *AuthDirInvalidCCs;
+  struct smartlist_t *AuthDirMiddleOnlyCCs;
   struct smartlist_t *AuthDirRejectCCs;
   /**@}*/
 
diff --git a/src/core/or/policies.c b/src/core/or/policies.c
index f91c23ad31..a53849b4d0 100644
--- a/src/core/or/policies.c
+++ b/src/core/or/policies.c
@@ -59,6 +59,9 @@ static smartlist_t *authdir_invalid_policy = NULL;
 /** Policy that addresses for incoming router descriptors must not
  * match in order to not be marked as BadExit. */
 static smartlist_t *authdir_badexit_policy = NULL;
+/** Policy that addresses for incoming router descriptors must not
+ * match in order to not be marked as MiddleOnly. */
+static smartlist_t *authdir_middleonly_policy = NULL;
 
 /** Parsed addr_policy_t describing which addresses we believe we can start
  * circuits at. */
@@ -1119,6 +1122,17 @@ authdir_policy_badexit_address(const tor_addr_t *addr, 
uint16_t port)
   return addr_is_in_cc_list(addr, get_options()->AuthDirBadExitCCs);
 }
 
+/** Return 1 if addr:port should be marked as MiddleOnly,
+ * based on authdir_middleonly_policy. Else return 0.
+ */
+int
+authdir_policy_middleonly_address(const tor_addr_t *addr, uint16_t port)
+{
+  if (!addr_policy_permits_tor_addr(addr, port, authdir_middleonly_policy))
+return 1;
+  return addr_is_in_cc_list(addr, get_options()->AuthDirMiddleOnlyCCs);
+}
+
 #define REJECT(arg) \
   STMT_BEGIN *msg = tor_strdup(arg); goto err; STMT_END
 
@@ -1173,6 +1187,9 @@ validate_addr_policies(const or_options_t *options, char 
**msg)
   if (parse_addr_policy(options->AuthDirBadExit, _policy,
 ADDR_POLICY_REJECT))
 REJECT("Error in AuthDirBadExit entry.");
+  if (parse_addr_policy(options->AuthDirMiddleOnly, _policy,
+ADDR_POLICY_REJECT))
+REJECT("Error in AuthDirMiddleOnly entry.");
 
   if (parse_addr_policy(options->ReachableAddresses, _policy,

[tor-commits] [tor/main] Add a new consensus method to handle MiddleOnly specially.

2021-10-21 Thread ahf

commit ab26475cabff49767c1b301371d81478695b5943
Author: Nick Mathewson 
Date:   Fri Oct 8 11:36:04 2021 -0400

Add a new consensus method to handle MiddleOnly specially.

When this method is in place, then any relay which is assigned
MiddleOnly has Exit, V2Dir, Guard, and HSDir cleared
(and has BadExit set if appropriate).
---
 src/feature/dirauth/dirvote.c | 41 +++--
 src/feature/dirauth/dirvote.h |  6 +-
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c
index 4f8cf2b8e6..9c13f762e2 100644
--- a/src/feature/dirauth/dirvote.c
+++ b/src/feature/dirauth/dirvote.c
@@ -1479,6 +1479,21 @@ compute_nth_protocol_set(int n, int n_voters, const 
smartlist_t *votes)
   return result;
 }
 
+/** Helper: Takes a smartlist of `const char *` flags, and a flag to remove.
+ *
+ * Removes that flag if it is present in the list.  Doesn't free it.
+ */
+static void
+remove_flag(smartlist_t *sl, const char *flag)
+{
+  /* We can't use smartlist_string_remove() here, since that doesn't preserve
+   * order, and since it frees elements from the string. */
+
+  int idx = smartlist_string_pos(sl, flag);
+  if (idx >= 0)
+smartlist_del_keeporder(sl, idx);
+}
+
 /** Given a list of vote networkstatus_t in votes, our public
  * authority identity_key, our private authority signing_key,
  * and the number of total_authorities that we believe exist in our
@@ -1633,6 +1648,9 @@ networkstatus_compute_consensus(smartlist_t *votes,
 tor_free(votesec_list);
 tor_free(distsec_list);
   }
+  // True if anybody is voting on the BadExit flag.
+  const bool badexit_flag_is_listed =
+smartlist_contains_string(flags, "BadExit");
 
   chunks = smartlist_new();
 
@@ -1924,7 +1942,7 @@ networkstatus_compute_consensus(smartlist_t *votes,
   const char *chosen_name = NULL;
   int exitsummary_disagreement = 0;
   int is_named = 0, is_unnamed = 0, is_running = 0, is_valid = 0;
-  int is_guard = 0, is_exit = 0, is_bad_exit = 0;
+  int is_guard = 0, is_exit = 0, is_bad_exit = 0, is_middle_only = 0;
   int naming_conflict = 0;
   int n_listing = 0;
   char microdesc_digest[DIGEST256_LEN];
@@ -2055,7 +2073,6 @@ networkstatus_compute_consensus(smartlist_t *votes,
   }
 
   /* Set the flags. */
-  smartlist_add(chosen_flags, (char*)"s"); /* for the start of the line. */
   SMARTLIST_FOREACH_BEGIN(flags, const char *, fl) {
 if (!strcmp(fl, "Named")) {
   if (is_named)
@@ -2077,6 +2094,8 @@ networkstatus_compute_consensus(smartlist_t *votes,
   is_running = 1;
 else if (!strcmp(fl, "BadExit"))
   is_bad_exit = 1;
+else if (!strcmp(fl, "MiddleOnly"))
+  is_middle_only = 1;
 else if (!strcmp(fl, "Valid"))
   is_valid = 1;
   }
@@ -2093,6 +2112,22 @@ networkstatus_compute_consensus(smartlist_t *votes,
   if (!is_valid)
 continue;
 
+  /* Starting with consensus method 32, we handle the middle-only
+   * flag specially: when it is present, we clear some flags, and
+   * set others. */
+  if (is_middle_only && consensus_method >= MIN_METHOD_FOR_MIDDLEONLY) {
+remove_flag(chosen_flags, "Exit");
+remove_flag(chosen_flags, "V2Dir");
+remove_flag(chosen_flags, "Guard");
+remove_flag(chosen_flags, "HSDir");
+is_exit = is_guard = 0;
+if (! is_bad_exit && badexit_flag_is_listed) {
+  is_bad_exit = 1;
+  smartlist_add(chosen_flags, (char *)"BadExit");
+  smartlist_sort_strings(chosen_flags); // restore order.
+}
+  }
+
   /* Pick the version. */
   if (smartlist_len(versions)) {
 sort_version_list(versions, 0);
@@ -2253,6 +2288,8 @@ networkstatus_compute_consensus(smartlist_t *votes,
 smartlist_add_asprintf(chunks, "m %s\n", m);
   }
   /* Next line is all flags.  The "\n" is missing. */
+  smartlist_add_asprintf(chunks, "s%s",
+ smartlist_len(chosen_flags)?" ":"");
   smartlist_add(chunks,
 smartlist_join_strings(chosen_flags, " ", 0, NULL));
   /* Now the version line. */
diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h
index d6a2d9cc75..9cb7fe1694 100644
--- a/src/feature/dirauth/dirvote.h
+++ b/src/feature/dirauth/dirvote.h
@@ -53,7 +53,7 @@
 #define MIN_SUPPORTED_CONSENSUS_METHOD 28
 
 /** The highest consensus method that we currently support. */
-#define MAX_SUPPORTED_CONSENSUS_METHOD 31
+#define MAX_SUPPORTED_CONSENSUS_METHOD 32
 
 /**
  * Lowest consensus method where microdescriptor lines are put in canonical
@@ -70,6 +70,10 @@
  */
 #define MIN_METHOD_FOR_CORRECT_BWWEIGHTSCALE 31
 
+/** Lowest consensus method for which we handle the MiddleOnly flag specially.
+ */
+#define MIN_METHOD_FOR_MIDDLEONLY 32
+
 /** Default bandwidth

[tor-commits] [tor/main] Prop335: Changes file and manual entries.

2021-10-21 Thread ahf

commit 54ab43d05e67984bda5661cb9530ad8a0b1e2a7a
Author: Nick Mathewson 
Date:   Fri Oct 8 11:42:55 2021 -0400

Prop335: Changes file and manual entries.

Closes #40448.
---
 changes/prop335   | 11 +++
 doc/man/tor.1.txt | 29 ++---
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/changes/prop335 b/changes/prop335
new file mode 100644
index 00..4fa61ca2e9
--- /dev/null
+++ b/changes/prop335
@@ -0,0 +1,11 @@
+  o Major features (directory authority):
+- Authorities can now be configured to label relays as "MiddleOnly".
+  When voting for this flag, authorities automatically vote against
+  Exit, Guard, HSDir, and V2Dir; and in favor of BadExit.
+  Implements part of proposal 335. Based on a patch from Neel
+  Chauhan.
+- Add a new consensus method to handle MiddleOnly specially. When
+  enough authorities are using this method, then any relay
+  tagged with the MiddleOnly flag will have its Exit, Guard, HSDir,
+  and V2Dir flags automatically cleared, and will have its BadExit flag
+  automatically set. Implements part of proposal 335.
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt
index 551ead7533..149d35b018 100644
--- a/doc/man/tor.1.txt
+++ b/doc/man/tor.1.txt
@@ -3025,6 +3025,11 @@ on the public Tor network.
 is the same as for exit policies, except that you don't need to say
 "accept" or "reject", and ports are not needed.)
 
+[[AuthDirMiddleOnly]] **AuthMiddleOnly** __AddressPattern...__::
+Authoritative directories only. A set of address patterns for servers that
+will be listed as middle-only in any network status document this authority
+publishes, if **AuthDirListMiddleOnly** is set. +
+
 [[AuthDirFastGuarantee]] **AuthDirFastGuarantee** __N__ 
**bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
 Authoritative directories only. If non-zero, always vote the
 Fast flag for any relay advertising this amount of capacity or
@@ -3072,6 +3077,13 @@ on the public Tor network.
 1 unless you plan to list non-functioning exits as bad; otherwise, you are
 effectively voting in favor of every declared exit as an exit.)
 
+[[AuthDirListMiddleOnly]] **AuthDirListMiddleOnly** **0**|**1**::
+Authoritative directories only. If set to 1, this directory has some
+opinion about which nodes should only be used in the middle position.
+(Do not set this to 1 unless you plan to list questionable relays
+as "middle only"; otherwise, you are effectively voting _against_
+middle-only status for every relay.)
+
 [[AuthDirMaxServersPerAddr]] **AuthDirMaxServersPerAddr** __NUM__::
 Authoritative directories only. The maximum number of servers that we will
 list as acceptable on a single IP address. Set this to "0" for "no limit".
@@ -3090,18 +3102,20 @@ on the public Tor network.
 authority publishes, or accepted as an OR address in any descriptor
 submitted for publication by this authority.
 
+[[AuthDirRejectRequestsUnderLoad]] **AuthDirRejectRequestsUnderLoad** 
**0**|**1**::
+If set, the directory authority will start rejecting directory requests
+from non relay connections by sending a 503 error code if it is under
+bandwidth pressure (reaching the configured limit if any). Relays will
+always tried to be answered even if this is on. (Default: 1)
+
 //Out of order because it logically belongs with the other CCs options.
 [[AuthDirBadExitCCs]] **AuthDirBadExitCCs** __CC__,... +
 
 //Out of order because it logically belongs with the other CCs options.
 [[AuthDirInvalidCCs]] **AuthDirInvalidCCs** __CC__,... +
 
-
-[[AuthDirRejectRequestsUnderLoad]] **AuthDirRejectRequestsUnderLoad** 
**0**|**1**::
-If set, the directory authority will start rejecting directory requests
-from non relay connections by sending a 503 error code if it is under
-bandwidth pressure (reaching the configured limit if any). Relays will
-always tried to be answered even if this is on. (Default: 1)
+//Out of order because it logically belongs with the other CCs options.
+[[AuthDirMiddleOnlytCCs]] **AuthDirMiddleOnlyCCs** __CC__,... +
 
 [[AuthDirRejectCCs]] **AuthDirRejectCCs** __CC__,...::
 Authoritative directories only. These options contain a comma-separated
@@ -3847,7 +3861,8 @@ __DataDirectory__/**`approved-routers`**::
 descriptors are accepted, but marked in the vote as not valid.
 If it is **!badexit**, then the authority will vote for it to receive a
 BadExit flag, indicating that it shouldn't be used for traffic leaving
-the Tor network.
+the Tor network.  If it is **!middleonly**, then the authority will
+vote for it to only be used in the middle of circuits.
 (Neither rejected nor invalid relays are included in the consensus.)
 
 __DataDirectory__/**`v3-status-votes`**::



___
tor-commits mailing list

[tor-commits] [tor/main] Merge branch 'tor-gitlab/mr/452_squashed' into main

2021-10-21 Thread ahf

commit ae05f06597364f5af20254ab8cf36c65591e59d9
Merge: d320f4d2a2 54ab43d05e
Author: Alexander FÃ¦rÃ¸y 
Date:   Thu Oct 21 12:57:37 2021 +

Merge branch 'tor-gitlab/mr/452_squashed' into main

 changes/prop335 | 11 +++
 doc/man/tor.1.txt   | 29 +-
 src/app/config/config.c |  3 ++
 src/app/config/or_options_st.h  |  4 +++
 src/core/or/policies.c  | 22 ++
 src/core/or/policies.h  |  1 +
 src/feature/dirauth/dirauth_options.inc |  4 +++
 src/feature/dirauth/dirvote.c   | 52 +
 src/feature/dirauth/dirvote.h   |  6 +++-
 src/feature/dirauth/process_descs.c | 15 ++
 src/feature/dirauth/process_descs.h |  3 +-
 src/feature/dirauth/voteflags.c | 11 ++-
 src/feature/dirauth/voteflags.h |  3 +-
 src/feature/dirparse/ns_parse.c |  2 ++
 src/feature/nodelist/fmt_routerstatus.c |  3 +-
 src/feature/nodelist/node_st.h  |  2 ++
 src/feature/nodelist/routerstatus_st.h  |  2 ++
 src/test/test_voting_flags.c|  3 +-
 18 files changed, 158 insertions(+), 18 deletions(-)

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

[tor-commits] [tor/main] bwauth: Add AuthDirDontVoteOnDirAuthBandwidth option to avoid giving weights to dirauths

2021-10-21 Thread ahf

commit b7992d4f793f0aa965e6efde1bca5c03cce95e8e
Author: Neel Chauhan 
Date:   Fri Sep 17 18:38:32 2021 -0700

bwauth: Add AuthDirDontVoteOnDirAuthBandwidth option to avoid giving 
weights to dirauths
---
 changes/bug40471| 4 
 src/feature/dirauth/dirauth_options.inc | 3 +++
 src/feature/dirauth/dirvote.c   | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/changes/bug40471 b/changes/bug40471
new file mode 100644
index 00..323e049599
--- /dev/null
+++ b/changes/bug40471
@@ -0,0 +1,4 @@
+  o Minor bugfixes (dirauth, bandwidth scanner):
+- Add the AuthDirDontVoteOnDirAuthBandwidth dirauth config parameter to
+  avoid voting on bandwidth scanner weights to v3 directory authorities.
+  Fixes bug 40471; bugfix on 0.2.2.1-alpha. Patch by Neel Chauhan.
diff --git a/src/feature/dirauth/dirauth_options.inc 
b/src/feature/dirauth/dirauth_options.inc
index 05726b8c2f..307ecbd286 100644
--- a/src/feature/dirauth/dirauth_options.inc
+++ b/src/feature/dirauth/dirauth_options.inc
@@ -109,4 +109,7 @@ CONF_VAR(VersioningAuthoritativeDirectory, BOOL, 0, "0")
  * pressure or not. */
 CONF_VAR(AuthDirRejectRequestsUnderLoad, BOOL, 0, "1")
 
+/** Boolean: Should we not give bandwidth weight measurements to dirauths? */
+CONF_VAR(AuthDirDontVoteOnDirAuthBandwidth, BOOL, 0, "1")
+
 END_CONF_STRUCT(dirauth_options_t)
diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c
index ffaa78b997..a00e0c0fb0 100644
--- a/src/feature/dirauth/dirvote.c
+++ b/src/feature/dirauth/dirvote.c
@@ -2265,7 +2265,8 @@ networkstatus_compute_consensus(smartlist_t *votes,
 smartlist_add_asprintf(chunks, "pr %s\n", chosen_protocol_list);
   }
   /* Now the weight line. */
-  if (rs_out.has_bandwidth) {
+  if (rs_out.has_bandwidth && (!rs_out.is_authority ||
+  !dirauth_get_options()->AuthDirDontVoteOnDirAuthBandwidth)) {
 char *guardfraction_str = NULL;
 int unmeasured = rs_out.bw_is_unmeasured;
 



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

[tor-commits] [tor/main] Merge remote-tracking branch 'tor-gitlab/mr/442' into main

2021-10-21 Thread ahf

commit d320f4d2a2b8208d4576be99e85babdd387d10c2
Merge: 998706c611 b7992d4f79
Author: Alexander FÃ¦rÃ¸y 
Date:   Thu Oct 21 12:50:28 2021 +

Merge remote-tracking branch 'tor-gitlab/mr/442' into main

 changes/bug40471| 4 
 src/feature/dirauth/dirauth_options.inc | 3 +++
 src/feature/dirauth/dirvote.c   | 3 ++-
 3 files changed, 9 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.6] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-10-21 Thread ahf

commit bd1c14f0156c4d166ed1706544242e31d7ddceff
Merge: 1e08efdb58 0135fb028c
Author: Alexander FÃ¦rÃ¸y 
Date:   Thu Oct 21 12:35:36 2021 +

Merge branch 'maint-0.4.5' into maint-0.4.6

 changes/ticket40337| 16 
 doc/man/tor.1.txt  |  5 +
 src/app/config/config.c|  2 ++
 src/app/config/or_options_st.h |  4 
 src/app/config/testnet.inc |  1 +
 src/feature/relay/router.c |  5 -
 src/feature/stats/bwhist.c | 19 ++-
 src/feature/stats/bwhist.h |  2 +-
 src/test/test_relay.c  |  4 ++--
 9 files changed, 49 insertions(+), 9 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.6] Make MinTimeToReportBandwidth a testing-only option (and rename it)

2021-10-21 Thread ahf

commit 9d7fca2306dc09097a24e225de59fb1ade7c9e34
Author: Nick Mathewson 
Date:   Tue May 11 15:49:00 2021 -0400

Make MinTimeToReportBandwidth a testing-only option (and rename it)
---
 changes/ticket40337|  5 +++--
 doc/man/tor.1.txt  | 12 +---
 src/app/config/config.c| 10 ++
 src/app/config/config.h|  7 ---
 src/app/config/or_options_st.h |  2 +-
 src/app/config/testnet.inc |  2 +-
 src/feature/stats/bwhist.c |  2 +-
 7 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/changes/ticket40337 b/changes/ticket40337
index f8f136a740..02ea29ffc1 100644
--- a/changes/ticket40337
+++ b/changes/ticket40337
@@ -1,5 +1,6 @@
-  o Minor features (bandwidth reporting):
-- Relays can now use the MinTimeToReportBandwidth option to change
+  o Minor features (testing):
+- On a testing network, relays can now use the
+  TestingMinTimeToReportBandwidth option to change
   the smallest amount of time over which they're willing to report
   their observed maximum bandwidth.  Previously, this was fixed
   at 1 day.  For safety, values under 2 hours are only supported on
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt
index af4ee494ef..209900832f 100644
--- a/doc/man/tor.1.txt
+++ b/doc/man/tor.1.txt
@@ -2448,13 +2448,6 @@ is non-zero):
 If we have more onionskins queued for processing than we can process in
 this amount of time, reject new ones. (Default: 1750 msec)
 
-[[MinTimeToReportBandwidth]] **MinTimeToReportBandwidth** __N__ 
**seconds**|**minutes**|**hours**::
-Do not report our measurements for our maximum observed bandwidth for any
-time period that has lasted for less than this amount of time.
-Setting this option too low can enable traffic analysis, and is
-not permitted except on testing networks.  Values over 1 day have
-no effect. (Default: 1 day)
-
 [[MyFamily]] **MyFamily** __fingerprint__,__fingerprint__,...::
 Declare that this Tor relay is controlled or administered by a group or
 organization identical or similar to that of the other relays, defined by
@@ -3602,6 +3595,11 @@ The following options are used for running a testing Tor 
network.
 Minimum value for the Fast flag.  Overrides the ordinary minimum taken
 from the consensus when TestingTorNetwork is set. (Default: 0.)
 
+[[TestingMinTimeToReportBandwidth]] **TestingMinTimeToReportBandwidth** __N__ 
**seconds**|**minutes**|**hours**::
+Do not report our measurements for our maximum observed bandwidth for any
+time period that has lasted for less than this amount of time.
+Values over 1 day have no effect. (Default: 1 day)
+
 [[TestingServerConsensusDownloadInitialDelay]] 
**TestingServerConsensusDownloadInitialDelay** __N__::
 Initial delay in seconds for when servers should download consensuses. 
Changing this
 requires that **TestingTorNetwork** is set. (Default: 0)
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 9011f36735..88da7a0aa7 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -563,7 +563,7 @@ static const config_var_t option_vars_[] = {
   V(MaxUnparseableDescSizeToLog, MEMUNIT, "10 MB"),
   VPORT(MetricsPort),
   V(MetricsPortPolicy,   LINELIST, NULL),
-  V(MinTimeToReportBandwidth,INTERVAL, "1 day"),
+  V(TestingMinTimeToReportBandwidth,INTERVAL, "1 day"),
   VAR("MyFamily",LINELIST, MyFamily_lines,   NULL),
   V(NewCircuitPeriod,INTERVAL, "30 seconds"),
   OBSOLETE("NamingAuthoritativeDirectory"),
@@ -3712,13 +3712,6 @@ options_validate_cb(const void *old_options_, void 
*options_, char **msg)
 options->HeartbeatPeriod = MIN_HEARTBEAT_PERIOD;
   }
 
-  if (options->MinTimeToReportBandwidth < MIN_MIN_TIME_TO_REPORT_BW &&
-  !options->TestingTorNetwork) {
-log_warn(LD_CONFIG, "MinTimeToReportBandwidth is too short; "
- "raising to %d seconds.", MIN_MIN_TIME_TO_REPORT_BW);
-options->MinTimeToReportBandwidth = MIN_MIN_TIME_TO_REPORT_BW;
-  }
-
   if (options->KeepalivePeriod < 1)
 REJECT("KeepalivePeriod option must be positive.");
 
@@ -3994,6 +3987,7 @@ options_validate_cb(const void *old_options_, void 
*options_, char **msg)
 CHECK_DEFAULT(TestingSigningKeySlop);
 CHECK_DEFAULT(TestingAuthKeySlop);
 CHECK_DEFAULT(TestingLinkKeySlop);
+CHECK_DEFAULT(TestingMinTimeToReportBandwidth);
 or_options_free(dflt_options);
   }
 #undef CHECK_DEFAULT
diff --git a/src/app/config/config.h b/src/app/config/config.h
index 74e6942eb5..e95ef4a728 100644
--- a/src/app/config/config.h
+++ b/src/app/config/config.h
@@ -24,13 +24,6 @@
  * expose more information than we're comfortable with. */
 #define MIN_HEARTBEAT_PERIOD (30*60)
 
-/**
- * Lowest allowable value for MinTimeToReportBandwidth on a non-testing
- * network; if this is too low we might report detail that is too
- * fine-grained.
- **/
-#define MIN_MIN_TIME_TO_REPORT_BW (2*60*60)
-

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

2021-10-21 Thread ahf

commit 5be41d420f6b68c4a5eb1206fefdb33bd616b66d
Merge: da02708be1 bd1c14f015
Author: Alexander FÃ¦rÃ¸y 
Date:   Thu Oct 21 12:35:36 2021 +

Merge branch 'maint-0.4.6' into release-0.4.6

 changes/ticket40337| 16 
 doc/man/tor.1.txt  |  5 +
 src/app/config/config.c|  2 ++
 src/app/config/or_options_st.h |  4 
 src/app/config/testnet.inc |  1 +
 src/feature/relay/router.c |  5 -
 src/feature/stats/bwhist.c | 19 ++-
 src/feature/stats/bwhist.h |  2 +-
 src/test/test_relay.c  |  4 ++--
 9 files changed, 49 insertions(+), 9 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.6] Merge remote-tracking branch 'tor-gitlab/mr/338' into maint-0.4.5

2021-10-21 Thread ahf

commit 0135fb028c8ca0ce310009f20efef89e53a36f2c
Merge: 5717b88bcb 265cca935a
Author: Alexander FÃ¦rÃ¸y 
Date:   Thu Oct 21 12:35:26 2021 +

Merge remote-tracking branch 'tor-gitlab/mr/338' into maint-0.4.5

 changes/ticket40337| 16 
 doc/man/tor.1.txt  |  5 +
 src/app/config/config.c|  2 ++
 src/app/config/or_options_st.h |  4 
 src/app/config/testnet.inc |  1 +
 src/feature/relay/router.c |  5 -
 src/feature/stats/bwhist.c | 19 ++-
 src/feature/stats/bwhist.h |  2 +-
 src/test/test_relay.c  |  4 ++--
 9 files changed, 49 insertions(+), 9 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.6] Ignore MAX_BANDWIDTH_CHANGE_FREQ on testing networks.

2021-10-21 Thread ahf

commit 265cca935aefd1a3bdbe6abc964858e10fb4a029
Author: Nick Mathewson 
Date:   Tue May 11 15:54:14 2021 -0400

Ignore MAX_BANDWIDTH_CHANGE_FREQ on testing networks.

Part of the ever-growing 40337 fix.
---
 changes/ticket40337| 3 +++
 src/feature/relay/router.c | 5 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changes/ticket40337 b/changes/ticket40337
index 02ea29ffc1..1c86fc4c99 100644
--- a/changes/ticket40337
+++ b/changes/ticket40337
@@ -11,3 +11,6 @@
   immediately from startup.  Previously, they waited
   until they had been running for a full day.   Closes ticket
   40337.
+- Relays on testing networks no longer rate-limit how frequently
+  they are willing to report new bandwidth measurements. Part of a fix
+  for ticket 40337.
diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c
index 2696b8633b..c95f36aa8b 100644
--- a/src/feature/relay/router.c
+++ b/src/feature/relay/router.c
@@ -2599,7 +2599,10 @@ check_descriptor_bandwidth_changed(time_t now)
   if ((prev != cur && (!prev || !cur)) ||
   cur > (prev * BANDWIDTH_CHANGE_FACTOR) ||
   cur < (prev / BANDWIDTH_CHANGE_FACTOR) ) {
-if (last_changed+MAX_BANDWIDTH_CHANGE_FREQ < now || !prev) {
+const bool change_recent_enough =
+  last_changed+MAX_BANDWIDTH_CHANGE_FREQ < now;
+const bool testing_network = get_options()->TestingTorNetwork;
+if (change_recent_enough || testing_network || !prev) {
   log_info(LD_GENERAL,
"Measured bandwidth has changed; rebuilding descriptor.");
   mark_my_descriptor_dirty("bandwidth has changed");



___
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.6] Add a MinTimeToReportBandwidth option; make it 0 for testing networks.

2021-10-21 Thread ahf

commit 2ae24d003d1d12e8e202748c4398d7438e4a65d9
Author: Nick Mathewson 
Date:   Wed Mar 17 08:45:37 2021 -0400

Add a MinTimeToReportBandwidth option; make it 0 for testing networks.

This option changes the time for which a bandwidth measurement period
must have been in progress before we include it when reporting our
observed bandwidth in our descriptors.  Without this option, we only
consider a time period towards our maximum if it has been running
for a full day.  Obviously, that's unacceptable for testing
networks, where we'd like to get results as soon as possible.

For non-testing networks, I've put a (somewhat arbitrary) 2-hour
minimum on the option, since there are traffic analysis concerns
with immediate reporting here.

Closes #40337.
---
 changes/ticket40337| 12 
 doc/man/tor.1.txt  |  7 +++
 src/app/config/config.c|  8 
 src/app/config/config.h|  7 +++
 src/app/config/or_options_st.h |  4 
 src/app/config/testnet.inc |  1 +
 src/feature/stats/bwhist.c | 19 ++-
 src/feature/stats/bwhist.h |  2 +-
 src/test/test_relay.c  |  4 ++--
 9 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/changes/ticket40337 b/changes/ticket40337
new file mode 100644
index 00..f8f136a740
--- /dev/null
+++ b/changes/ticket40337
@@ -0,0 +1,12 @@
+  o Minor features (bandwidth reporting):
+- Relays can now use the MinTimeToReportBandwidth option to change
+  the smallest amount of time over which they're willing to report
+  their observed maximum bandwidth.  Previously, this was fixed
+  at 1 day.  For safety, values under 2 hours are only supported on
+  testing networks. Part of a fix for ticket 40337.
+
+  o Minor features (testing):
+- Relays on testing networks now report their observed bandwidths
+  immediately from startup.  Previously, they waited
+  until they had been running for a full day.   Closes ticket
+  40337.
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt
index b57c6ec70a..af4ee494ef 100644
--- a/doc/man/tor.1.txt
+++ b/doc/man/tor.1.txt
@@ -2448,6 +2448,13 @@ is non-zero):
 If we have more onionskins queued for processing than we can process in
 this amount of time, reject new ones. (Default: 1750 msec)
 
+[[MinTimeToReportBandwidth]] **MinTimeToReportBandwidth** __N__ 
**seconds**|**minutes**|**hours**::
+Do not report our measurements for our maximum observed bandwidth for any
+time period that has lasted for less than this amount of time.
+Setting this option too low can enable traffic analysis, and is
+not permitted except on testing networks.  Values over 1 day have
+no effect. (Default: 1 day)
+
 [[MyFamily]] **MyFamily** __fingerprint__,__fingerprint__,...::
 Declare that this Tor relay is controlled or administered by a group or
 organization identical or similar to that of the other relays, defined by
diff --git a/src/app/config/config.c b/src/app/config/config.c
index fa74907b3d..9011f36735 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -563,6 +563,7 @@ static const config_var_t option_vars_[] = {
   V(MaxUnparseableDescSizeToLog, MEMUNIT, "10 MB"),
   VPORT(MetricsPort),
   V(MetricsPortPolicy,   LINELIST, NULL),
+  V(MinTimeToReportBandwidth,INTERVAL, "1 day"),
   VAR("MyFamily",LINELIST, MyFamily_lines,   NULL),
   V(NewCircuitPeriod,INTERVAL, "30 seconds"),
   OBSOLETE("NamingAuthoritativeDirectory"),
@@ -3711,6 +3712,13 @@ options_validate_cb(const void *old_options_, void 
*options_, char **msg)
 options->HeartbeatPeriod = MIN_HEARTBEAT_PERIOD;
   }
 
+  if (options->MinTimeToReportBandwidth < MIN_MIN_TIME_TO_REPORT_BW &&
+  !options->TestingTorNetwork) {
+log_warn(LD_CONFIG, "MinTimeToReportBandwidth is too short; "
+ "raising to %d seconds.", MIN_MIN_TIME_TO_REPORT_BW);
+options->MinTimeToReportBandwidth = MIN_MIN_TIME_TO_REPORT_BW;
+  }
+
   if (options->KeepalivePeriod < 1)
 REJECT("KeepalivePeriod option must be positive.");
 
diff --git a/src/app/config/config.h b/src/app/config/config.h
index e95ef4a728..74e6942eb5 100644
--- a/src/app/config/config.h
+++ b/src/app/config/config.h
@@ -24,6 +24,13 @@
  * expose more information than we're comfortable with. */
 #define MIN_HEARTBEAT_PERIOD (30*60)
 
+/**
+ * Lowest allowable value for MinTimeToReportBandwidth on a non-testing
+ * network; if this is too low we might report detail that is too
+ * fine-grained.
+ **/
+#define MIN_MIN_TIME_TO_REPORT_BW (2*60*60)
+
 /** Maximum default value for MaxMemInQueues, in bytes. */
 #if SIZEOF_VOID_P >= 8
 #define MAX_DEFAULT_MEMORY_QUEUE_SIZE (UINT64_C(8) << 30)
diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h
index 4364f145ed..efecc85d66 100644
--- a/src/app/config/or_options_st.h
+++

[tor-commits] [tor/release-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/338' into maint-0.4.5

2021-10-21 Thread ahf

commit 0135fb028c8ca0ce310009f20efef89e53a36f2c
Merge: 5717b88bcb 265cca935a
Author: Alexander FÃ¦rÃ¸y 
Date:   Thu Oct 21 12:35:26 2021 +

Merge remote-tracking branch 'tor-gitlab/mr/338' into maint-0.4.5

 changes/ticket40337| 16 
 doc/man/tor.1.txt  |  5 +
 src/app/config/config.c|  2 ++
 src/app/config/or_options_st.h |  4 
 src/app/config/testnet.inc |  1 +
 src/feature/relay/router.c |  5 -
 src/feature/stats/bwhist.c | 19 ++-
 src/feature/stats/bwhist.h |  2 +-
 src/test/test_relay.c  |  4 ++--
 9 files changed, 49 insertions(+), 9 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] Merge branch 'maint-0.4.5' into release-0.4.5

2021-10-21 Thread ahf

commit b98aad5be2a96a09007dfaec0ad0b743255d9c22
Merge: d6b6cd7cd7 0135fb028c
Author: Alexander FÃ¦rÃ¸y 
Date:   Thu Oct 21 12:35:36 2021 +

Merge branch 'maint-0.4.5' into release-0.4.5

 changes/ticket40337| 16 
 doc/man/tor.1.txt  |  5 +
 src/app/config/config.c|  2 ++
 src/app/config/or_options_st.h |  4 
 src/app/config/testnet.inc |  1 +
 src/feature/relay/router.c |  5 -
 src/feature/stats/bwhist.c | 19 ++-
 src/feature/stats/bwhist.h |  2 +-
 src/test/test_relay.c  |  4 ++--
 9 files changed, 49 insertions(+), 9 deletions(-)

___
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.6] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-10-21 Thread ahf

commit bd1c14f0156c4d166ed1706544242e31d7ddceff
Merge: 1e08efdb58 0135fb028c
Author: Alexander FÃ¦rÃ¸y 
Date:   Thu Oct 21 12:35:36 2021 +

Merge branch 'maint-0.4.5' into maint-0.4.6

 changes/ticket40337| 16 
 doc/man/tor.1.txt  |  5 +
 src/app/config/config.c|  2 ++
 src/app/config/or_options_st.h |  4 
 src/app/config/testnet.inc |  1 +
 src/feature/relay/router.c |  5 -
 src/feature/stats/bwhist.c | 19 ++-
 src/feature/stats/bwhist.h |  2 +-
 src/test/test_relay.c  |  4 ++--
 9 files changed, 49 insertions(+), 9 deletions(-)

___
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.6] Merge remote-tracking branch 'tor-gitlab/mr/338' into maint-0.4.5

2021-10-21 Thread ahf

commit 0135fb028c8ca0ce310009f20efef89e53a36f2c
Merge: 5717b88bcb 265cca935a
Author: Alexander FÃ¦rÃ¸y 
Date:   Thu Oct 21 12:35:26 2021 +

Merge remote-tracking branch 'tor-gitlab/mr/338' into maint-0.4.5

 changes/ticket40337| 16 
 doc/man/tor.1.txt  |  5 +
 src/app/config/config.c|  2 ++
 src/app/config/or_options_st.h |  4 
 src/app/config/testnet.inc |  1 +
 src/feature/relay/router.c |  5 -
 src/feature/stats/bwhist.c | 19 ++-
 src/feature/stats/bwhist.h |  2 +-
 src/test/test_relay.c  |  4 ++--
 9 files changed, 49 insertions(+), 9 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] Ignore MAX_BANDWIDTH_CHANGE_FREQ on testing networks.

2021-10-21 Thread ahf

commit 265cca935aefd1a3bdbe6abc964858e10fb4a029
Author: Nick Mathewson 
Date:   Tue May 11 15:54:14 2021 -0400

Ignore MAX_BANDWIDTH_CHANGE_FREQ on testing networks.

Part of the ever-growing 40337 fix.
---
 changes/ticket40337| 3 +++
 src/feature/relay/router.c | 5 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changes/ticket40337 b/changes/ticket40337
index 02ea29ffc1..1c86fc4c99 100644
--- a/changes/ticket40337
+++ b/changes/ticket40337
@@ -11,3 +11,6 @@
   immediately from startup.  Previously, they waited
   until they had been running for a full day.   Closes ticket
   40337.
+- Relays on testing networks no longer rate-limit how frequently
+  they are willing to report new bandwidth measurements. Part of a fix
+  for ticket 40337.
diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c
index 2696b8633b..c95f36aa8b 100644
--- a/src/feature/relay/router.c
+++ b/src/feature/relay/router.c
@@ -2599,7 +2599,10 @@ check_descriptor_bandwidth_changed(time_t now)
   if ((prev != cur && (!prev || !cur)) ||
   cur > (prev * BANDWIDTH_CHANGE_FACTOR) ||
   cur < (prev / BANDWIDTH_CHANGE_FACTOR) ) {
-if (last_changed+MAX_BANDWIDTH_CHANGE_FREQ < now || !prev) {
+const bool change_recent_enough =
+  last_changed+MAX_BANDWIDTH_CHANGE_FREQ < now;
+const bool testing_network = get_options()->TestingTorNetwork;
+if (change_recent_enough || testing_network || !prev) {
   log_info(LD_GENERAL,
"Measured bandwidth has changed; rebuilding descriptor.");
   mark_my_descriptor_dirty("bandwidth has changed");



___
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] Make MinTimeToReportBandwidth a testing-only option (and rename it)

2021-10-21 Thread ahf

commit 9d7fca2306dc09097a24e225de59fb1ade7c9e34
Author: Nick Mathewson 
Date:   Tue May 11 15:49:00 2021 -0400

Make MinTimeToReportBandwidth a testing-only option (and rename it)
---
 changes/ticket40337|  5 +++--
 doc/man/tor.1.txt  | 12 +---
 src/app/config/config.c| 10 ++
 src/app/config/config.h|  7 ---
 src/app/config/or_options_st.h |  2 +-
 src/app/config/testnet.inc |  2 +-
 src/feature/stats/bwhist.c |  2 +-
 7 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/changes/ticket40337 b/changes/ticket40337
index f8f136a740..02ea29ffc1 100644
--- a/changes/ticket40337
+++ b/changes/ticket40337
@@ -1,5 +1,6 @@
-  o Minor features (bandwidth reporting):
-- Relays can now use the MinTimeToReportBandwidth option to change
+  o Minor features (testing):
+- On a testing network, relays can now use the
+  TestingMinTimeToReportBandwidth option to change
   the smallest amount of time over which they're willing to report
   their observed maximum bandwidth.  Previously, this was fixed
   at 1 day.  For safety, values under 2 hours are only supported on
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt
index af4ee494ef..209900832f 100644
--- a/doc/man/tor.1.txt
+++ b/doc/man/tor.1.txt
@@ -2448,13 +2448,6 @@ is non-zero):
 If we have more onionskins queued for processing than we can process in
 this amount of time, reject new ones. (Default: 1750 msec)
 
-[[MinTimeToReportBandwidth]] **MinTimeToReportBandwidth** __N__ 
**seconds**|**minutes**|**hours**::
-Do not report our measurements for our maximum observed bandwidth for any
-time period that has lasted for less than this amount of time.
-Setting this option too low can enable traffic analysis, and is
-not permitted except on testing networks.  Values over 1 day have
-no effect. (Default: 1 day)
-
 [[MyFamily]] **MyFamily** __fingerprint__,__fingerprint__,...::
 Declare that this Tor relay is controlled or administered by a group or
 organization identical or similar to that of the other relays, defined by
@@ -3602,6 +3595,11 @@ The following options are used for running a testing Tor 
network.
 Minimum value for the Fast flag.  Overrides the ordinary minimum taken
 from the consensus when TestingTorNetwork is set. (Default: 0.)
 
+[[TestingMinTimeToReportBandwidth]] **TestingMinTimeToReportBandwidth** __N__ 
**seconds**|**minutes**|**hours**::
+Do not report our measurements for our maximum observed bandwidth for any
+time period that has lasted for less than this amount of time.
+Values over 1 day have no effect. (Default: 1 day)
+
 [[TestingServerConsensusDownloadInitialDelay]] 
**TestingServerConsensusDownloadInitialDelay** __N__::
 Initial delay in seconds for when servers should download consensuses. 
Changing this
 requires that **TestingTorNetwork** is set. (Default: 0)
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 9011f36735..88da7a0aa7 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -563,7 +563,7 @@ static const config_var_t option_vars_[] = {
   V(MaxUnparseableDescSizeToLog, MEMUNIT, "10 MB"),
   VPORT(MetricsPort),
   V(MetricsPortPolicy,   LINELIST, NULL),
-  V(MinTimeToReportBandwidth,INTERVAL, "1 day"),
+  V(TestingMinTimeToReportBandwidth,INTERVAL, "1 day"),
   VAR("MyFamily",LINELIST, MyFamily_lines,   NULL),
   V(NewCircuitPeriod,INTERVAL, "30 seconds"),
   OBSOLETE("NamingAuthoritativeDirectory"),
@@ -3712,13 +3712,6 @@ options_validate_cb(const void *old_options_, void 
*options_, char **msg)
 options->HeartbeatPeriod = MIN_HEARTBEAT_PERIOD;
   }
 
-  if (options->MinTimeToReportBandwidth < MIN_MIN_TIME_TO_REPORT_BW &&
-  !options->TestingTorNetwork) {
-log_warn(LD_CONFIG, "MinTimeToReportBandwidth is too short; "
- "raising to %d seconds.", MIN_MIN_TIME_TO_REPORT_BW);
-options->MinTimeToReportBandwidth = MIN_MIN_TIME_TO_REPORT_BW;
-  }
-
   if (options->KeepalivePeriod < 1)
 REJECT("KeepalivePeriod option must be positive.");
 
@@ -3994,6 +3987,7 @@ options_validate_cb(const void *old_options_, void 
*options_, char **msg)
 CHECK_DEFAULT(TestingSigningKeySlop);
 CHECK_DEFAULT(TestingAuthKeySlop);
 CHECK_DEFAULT(TestingLinkKeySlop);
+CHECK_DEFAULT(TestingMinTimeToReportBandwidth);
 or_options_free(dflt_options);
   }
 #undef CHECK_DEFAULT
diff --git a/src/app/config/config.h b/src/app/config/config.h
index 74e6942eb5..e95ef4a728 100644
--- a/src/app/config/config.h
+++ b/src/app/config/config.h
@@ -24,13 +24,6 @@
  * expose more information than we're comfortable with. */
 #define MIN_HEARTBEAT_PERIOD (30*60)
 
-/**
- * Lowest allowable value for MinTimeToReportBandwidth on a non-testing
- * network; if this is too low we might report detail that is too
- * fine-grained.
- **/
-#define MIN_MIN_TIME_TO_REPORT_BW (2*60*60)
-

[tor-commits] [tor/release-0.4.5] Add a MinTimeToReportBandwidth option; make it 0 for testing networks.

2021-10-21 Thread ahf

commit 2ae24d003d1d12e8e202748c4398d7438e4a65d9
Author: Nick Mathewson 
Date:   Wed Mar 17 08:45:37 2021 -0400

Add a MinTimeToReportBandwidth option; make it 0 for testing networks.

This option changes the time for which a bandwidth measurement period
must have been in progress before we include it when reporting our
observed bandwidth in our descriptors.  Without this option, we only
consider a time period towards our maximum if it has been running
for a full day.  Obviously, that's unacceptable for testing
networks, where we'd like to get results as soon as possible.

For non-testing networks, I've put a (somewhat arbitrary) 2-hour
minimum on the option, since there are traffic analysis concerns
with immediate reporting here.

Closes #40337.
---
 changes/ticket40337| 12 
 doc/man/tor.1.txt  |  7 +++
 src/app/config/config.c|  8 
 src/app/config/config.h|  7 +++
 src/app/config/or_options_st.h |  4 
 src/app/config/testnet.inc |  1 +
 src/feature/stats/bwhist.c | 19 ++-
 src/feature/stats/bwhist.h |  2 +-
 src/test/test_relay.c  |  4 ++--
 9 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/changes/ticket40337 b/changes/ticket40337
new file mode 100644
index 00..f8f136a740
--- /dev/null
+++ b/changes/ticket40337
@@ -0,0 +1,12 @@
+  o Minor features (bandwidth reporting):
+- Relays can now use the MinTimeToReportBandwidth option to change
+  the smallest amount of time over which they're willing to report
+  their observed maximum bandwidth.  Previously, this was fixed
+  at 1 day.  For safety, values under 2 hours are only supported on
+  testing networks. Part of a fix for ticket 40337.
+
+  o Minor features (testing):
+- Relays on testing networks now report their observed bandwidths
+  immediately from startup.  Previously, they waited
+  until they had been running for a full day.   Closes ticket
+  40337.
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt
index b57c6ec70a..af4ee494ef 100644
--- a/doc/man/tor.1.txt
+++ b/doc/man/tor.1.txt
@@ -2448,6 +2448,13 @@ is non-zero):
 If we have more onionskins queued for processing than we can process in
 this amount of time, reject new ones. (Default: 1750 msec)
 
+[[MinTimeToReportBandwidth]] **MinTimeToReportBandwidth** __N__ 
**seconds**|**minutes**|**hours**::
+Do not report our measurements for our maximum observed bandwidth for any
+time period that has lasted for less than this amount of time.
+Setting this option too low can enable traffic analysis, and is
+not permitted except on testing networks.  Values over 1 day have
+no effect. (Default: 1 day)
+
 [[MyFamily]] **MyFamily** __fingerprint__,__fingerprint__,...::
 Declare that this Tor relay is controlled or administered by a group or
 organization identical or similar to that of the other relays, defined by
diff --git a/src/app/config/config.c b/src/app/config/config.c
index fa74907b3d..9011f36735 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -563,6 +563,7 @@ static const config_var_t option_vars_[] = {
   V(MaxUnparseableDescSizeToLog, MEMUNIT, "10 MB"),
   VPORT(MetricsPort),
   V(MetricsPortPolicy,   LINELIST, NULL),
+  V(MinTimeToReportBandwidth,INTERVAL, "1 day"),
   VAR("MyFamily",LINELIST, MyFamily_lines,   NULL),
   V(NewCircuitPeriod,INTERVAL, "30 seconds"),
   OBSOLETE("NamingAuthoritativeDirectory"),
@@ -3711,6 +3712,13 @@ options_validate_cb(const void *old_options_, void 
*options_, char **msg)
 options->HeartbeatPeriod = MIN_HEARTBEAT_PERIOD;
   }
 
+  if (options->MinTimeToReportBandwidth < MIN_MIN_TIME_TO_REPORT_BW &&
+  !options->TestingTorNetwork) {
+log_warn(LD_CONFIG, "MinTimeToReportBandwidth is too short; "
+ "raising to %d seconds.", MIN_MIN_TIME_TO_REPORT_BW);
+options->MinTimeToReportBandwidth = MIN_MIN_TIME_TO_REPORT_BW;
+  }
+
   if (options->KeepalivePeriod < 1)
 REJECT("KeepalivePeriod option must be positive.");
 
diff --git a/src/app/config/config.h b/src/app/config/config.h
index e95ef4a728..74e6942eb5 100644
--- a/src/app/config/config.h
+++ b/src/app/config/config.h
@@ -24,6 +24,13 @@
  * expose more information than we're comfortable with. */
 #define MIN_HEARTBEAT_PERIOD (30*60)
 
+/**
+ * Lowest allowable value for MinTimeToReportBandwidth on a non-testing
+ * network; if this is too low we might report detail that is too
+ * fine-grained.
+ **/
+#define MIN_MIN_TIME_TO_REPORT_BW (2*60*60)
+
 /** Maximum default value for MaxMemInQueues, in bytes. */
 #if SIZEOF_VOID_P >= 8
 #define MAX_DEFAULT_MEMORY_QUEUE_SIZE (UINT64_C(8) << 30)
diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h
index 4364f145ed..efecc85d66 100644
--- a/src/app/config/or_options_st.h
+++

[tor-commits] [tor/maint-0.4.6] Ignore MAX_BANDWIDTH_CHANGE_FREQ on testing networks.

2021-10-21 Thread ahf

commit 265cca935aefd1a3bdbe6abc964858e10fb4a029
Author: Nick Mathewson 
Date:   Tue May 11 15:54:14 2021 -0400

Ignore MAX_BANDWIDTH_CHANGE_FREQ on testing networks.

Part of the ever-growing 40337 fix.
---
 changes/ticket40337| 3 +++
 src/feature/relay/router.c | 5 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changes/ticket40337 b/changes/ticket40337
index 02ea29ffc1..1c86fc4c99 100644
--- a/changes/ticket40337
+++ b/changes/ticket40337
@@ -11,3 +11,6 @@
   immediately from startup.  Previously, they waited
   until they had been running for a full day.   Closes ticket
   40337.
+- Relays on testing networks no longer rate-limit how frequently
+  they are willing to report new bandwidth measurements. Part of a fix
+  for ticket 40337.
diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c
index 2696b8633b..c95f36aa8b 100644
--- a/src/feature/relay/router.c
+++ b/src/feature/relay/router.c
@@ -2599,7 +2599,10 @@ check_descriptor_bandwidth_changed(time_t now)
   if ((prev != cur && (!prev || !cur)) ||
   cur > (prev * BANDWIDTH_CHANGE_FACTOR) ||
   cur < (prev / BANDWIDTH_CHANGE_FACTOR) ) {
-if (last_changed+MAX_BANDWIDTH_CHANGE_FREQ < now || !prev) {
+const bool change_recent_enough =
+  last_changed+MAX_BANDWIDTH_CHANGE_FREQ < now;
+const bool testing_network = get_options()->TestingTorNetwork;
+if (change_recent_enough || testing_network || !prev) {
   log_info(LD_GENERAL,
"Measured bandwidth has changed; rebuilding descriptor.");
   mark_my_descriptor_dirty("bandwidth has changed");



___
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.6] Add a MinTimeToReportBandwidth option; make it 0 for testing networks.

2021-10-21 Thread ahf

commit 2ae24d003d1d12e8e202748c4398d7438e4a65d9
Author: Nick Mathewson 
Date:   Wed Mar 17 08:45:37 2021 -0400

Add a MinTimeToReportBandwidth option; make it 0 for testing networks.

This option changes the time for which a bandwidth measurement period
must have been in progress before we include it when reporting our
observed bandwidth in our descriptors.  Without this option, we only
consider a time period towards our maximum if it has been running
for a full day.  Obviously, that's unacceptable for testing
networks, where we'd like to get results as soon as possible.

For non-testing networks, I've put a (somewhat arbitrary) 2-hour
minimum on the option, since there are traffic analysis concerns
with immediate reporting here.

Closes #40337.
---
 changes/ticket40337| 12 
 doc/man/tor.1.txt  |  7 +++
 src/app/config/config.c|  8 
 src/app/config/config.h|  7 +++
 src/app/config/or_options_st.h |  4 
 src/app/config/testnet.inc |  1 +
 src/feature/stats/bwhist.c | 19 ++-
 src/feature/stats/bwhist.h |  2 +-
 src/test/test_relay.c  |  4 ++--
 9 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/changes/ticket40337 b/changes/ticket40337
new file mode 100644
index 00..f8f136a740
--- /dev/null
+++ b/changes/ticket40337
@@ -0,0 +1,12 @@
+  o Minor features (bandwidth reporting):
+- Relays can now use the MinTimeToReportBandwidth option to change
+  the smallest amount of time over which they're willing to report
+  their observed maximum bandwidth.  Previously, this was fixed
+  at 1 day.  For safety, values under 2 hours are only supported on
+  testing networks. Part of a fix for ticket 40337.
+
+  o Minor features (testing):
+- Relays on testing networks now report their observed bandwidths
+  immediately from startup.  Previously, they waited
+  until they had been running for a full day.   Closes ticket
+  40337.
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt
index b57c6ec70a..af4ee494ef 100644
--- a/doc/man/tor.1.txt
+++ b/doc/man/tor.1.txt
@@ -2448,6 +2448,13 @@ is non-zero):
 If we have more onionskins queued for processing than we can process in
 this amount of time, reject new ones. (Default: 1750 msec)
 
+[[MinTimeToReportBandwidth]] **MinTimeToReportBandwidth** __N__ 
**seconds**|**minutes**|**hours**::
+Do not report our measurements for our maximum observed bandwidth for any
+time period that has lasted for less than this amount of time.
+Setting this option too low can enable traffic analysis, and is
+not permitted except on testing networks.  Values over 1 day have
+no effect. (Default: 1 day)
+
 [[MyFamily]] **MyFamily** __fingerprint__,__fingerprint__,...::
 Declare that this Tor relay is controlled or administered by a group or
 organization identical or similar to that of the other relays, defined by
diff --git a/src/app/config/config.c b/src/app/config/config.c
index fa74907b3d..9011f36735 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -563,6 +563,7 @@ static const config_var_t option_vars_[] = {
   V(MaxUnparseableDescSizeToLog, MEMUNIT, "10 MB"),
   VPORT(MetricsPort),
   V(MetricsPortPolicy,   LINELIST, NULL),
+  V(MinTimeToReportBandwidth,INTERVAL, "1 day"),
   VAR("MyFamily",LINELIST, MyFamily_lines,   NULL),
   V(NewCircuitPeriod,INTERVAL, "30 seconds"),
   OBSOLETE("NamingAuthoritativeDirectory"),
@@ -3711,6 +3712,13 @@ options_validate_cb(const void *old_options_, void 
*options_, char **msg)
 options->HeartbeatPeriod = MIN_HEARTBEAT_PERIOD;
   }
 
+  if (options->MinTimeToReportBandwidth < MIN_MIN_TIME_TO_REPORT_BW &&
+  !options->TestingTorNetwork) {
+log_warn(LD_CONFIG, "MinTimeToReportBandwidth is too short; "
+ "raising to %d seconds.", MIN_MIN_TIME_TO_REPORT_BW);
+options->MinTimeToReportBandwidth = MIN_MIN_TIME_TO_REPORT_BW;
+  }
+
   if (options->KeepalivePeriod < 1)
 REJECT("KeepalivePeriod option must be positive.");
 
diff --git a/src/app/config/config.h b/src/app/config/config.h
index e95ef4a728..74e6942eb5 100644
--- a/src/app/config/config.h
+++ b/src/app/config/config.h
@@ -24,6 +24,13 @@
  * expose more information than we're comfortable with. */
 #define MIN_HEARTBEAT_PERIOD (30*60)
 
+/**
+ * Lowest allowable value for MinTimeToReportBandwidth on a non-testing
+ * network; if this is too low we might report detail that is too
+ * fine-grained.
+ **/
+#define MIN_MIN_TIME_TO_REPORT_BW (2*60*60)
+
 /** Maximum default value for MaxMemInQueues, in bytes. */
 #if SIZEOF_VOID_P >= 8
 #define MAX_DEFAULT_MEMORY_QUEUE_SIZE (UINT64_C(8) << 30)
diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h
index 4364f145ed..efecc85d66 100644
--- a/src/app/config/or_options_st.h
+++

[tor-commits] [tor/maint-0.4.5] Ignore MAX_BANDWIDTH_CHANGE_FREQ on testing networks.

2021-10-21 Thread ahf

commit 265cca935aefd1a3bdbe6abc964858e10fb4a029
Author: Nick Mathewson 
Date:   Tue May 11 15:54:14 2021 -0400

Ignore MAX_BANDWIDTH_CHANGE_FREQ on testing networks.

Part of the ever-growing 40337 fix.
---
 changes/ticket40337| 3 +++
 src/feature/relay/router.c | 5 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changes/ticket40337 b/changes/ticket40337
index 02ea29ffc1..1c86fc4c99 100644
--- a/changes/ticket40337
+++ b/changes/ticket40337
@@ -11,3 +11,6 @@
   immediately from startup.  Previously, they waited
   until they had been running for a full day.   Closes ticket
   40337.
+- Relays on testing networks no longer rate-limit how frequently
+  they are willing to report new bandwidth measurements. Part of a fix
+  for ticket 40337.
diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c
index 2696b8633b..c95f36aa8b 100644
--- a/src/feature/relay/router.c
+++ b/src/feature/relay/router.c
@@ -2599,7 +2599,10 @@ check_descriptor_bandwidth_changed(time_t now)
   if ((prev != cur && (!prev || !cur)) ||
   cur > (prev * BANDWIDTH_CHANGE_FACTOR) ||
   cur < (prev / BANDWIDTH_CHANGE_FACTOR) ) {
-if (last_changed+MAX_BANDWIDTH_CHANGE_FREQ < now || !prev) {
+const bool change_recent_enough =
+  last_changed+MAX_BANDWIDTH_CHANGE_FREQ < now;
+const bool testing_network = get_options()->TestingTorNetwork;
+if (change_recent_enough || testing_network || !prev) {
   log_info(LD_GENERAL,
"Measured bandwidth has changed; rebuilding descriptor.");
   mark_my_descriptor_dirty("bandwidth has changed");



___
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.6] Make MinTimeToReportBandwidth a testing-only option (and rename it)

2021-10-21 Thread ahf

commit 9d7fca2306dc09097a24e225de59fb1ade7c9e34
Author: Nick Mathewson 
Date:   Tue May 11 15:49:00 2021 -0400

Make MinTimeToReportBandwidth a testing-only option (and rename it)
---
 changes/ticket40337|  5 +++--
 doc/man/tor.1.txt  | 12 +---
 src/app/config/config.c| 10 ++
 src/app/config/config.h|  7 ---
 src/app/config/or_options_st.h |  2 +-
 src/app/config/testnet.inc |  2 +-
 src/feature/stats/bwhist.c |  2 +-
 7 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/changes/ticket40337 b/changes/ticket40337
index f8f136a740..02ea29ffc1 100644
--- a/changes/ticket40337
+++ b/changes/ticket40337
@@ -1,5 +1,6 @@
-  o Minor features (bandwidth reporting):
-- Relays can now use the MinTimeToReportBandwidth option to change
+  o Minor features (testing):
+- On a testing network, relays can now use the
+  TestingMinTimeToReportBandwidth option to change
   the smallest amount of time over which they're willing to report
   their observed maximum bandwidth.  Previously, this was fixed
   at 1 day.  For safety, values under 2 hours are only supported on
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt
index af4ee494ef..209900832f 100644
--- a/doc/man/tor.1.txt
+++ b/doc/man/tor.1.txt
@@ -2448,13 +2448,6 @@ is non-zero):
 If we have more onionskins queued for processing than we can process in
 this amount of time, reject new ones. (Default: 1750 msec)
 
-[[MinTimeToReportBandwidth]] **MinTimeToReportBandwidth** __N__ 
**seconds**|**minutes**|**hours**::
-Do not report our measurements for our maximum observed bandwidth for any
-time period that has lasted for less than this amount of time.
-Setting this option too low can enable traffic analysis, and is
-not permitted except on testing networks.  Values over 1 day have
-no effect. (Default: 1 day)
-
 [[MyFamily]] **MyFamily** __fingerprint__,__fingerprint__,...::
 Declare that this Tor relay is controlled or administered by a group or
 organization identical or similar to that of the other relays, defined by
@@ -3602,6 +3595,11 @@ The following options are used for running a testing Tor 
network.
 Minimum value for the Fast flag.  Overrides the ordinary minimum taken
 from the consensus when TestingTorNetwork is set. (Default: 0.)
 
+[[TestingMinTimeToReportBandwidth]] **TestingMinTimeToReportBandwidth** __N__ 
**seconds**|**minutes**|**hours**::
+Do not report our measurements for our maximum observed bandwidth for any
+time period that has lasted for less than this amount of time.
+Values over 1 day have no effect. (Default: 1 day)
+
 [[TestingServerConsensusDownloadInitialDelay]] 
**TestingServerConsensusDownloadInitialDelay** __N__::
 Initial delay in seconds for when servers should download consensuses. 
Changing this
 requires that **TestingTorNetwork** is set. (Default: 0)
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 9011f36735..88da7a0aa7 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -563,7 +563,7 @@ static const config_var_t option_vars_[] = {
   V(MaxUnparseableDescSizeToLog, MEMUNIT, "10 MB"),
   VPORT(MetricsPort),
   V(MetricsPortPolicy,   LINELIST, NULL),
-  V(MinTimeToReportBandwidth,INTERVAL, "1 day"),
+  V(TestingMinTimeToReportBandwidth,INTERVAL, "1 day"),
   VAR("MyFamily",LINELIST, MyFamily_lines,   NULL),
   V(NewCircuitPeriod,INTERVAL, "30 seconds"),
   OBSOLETE("NamingAuthoritativeDirectory"),
@@ -3712,13 +3712,6 @@ options_validate_cb(const void *old_options_, void 
*options_, char **msg)
 options->HeartbeatPeriod = MIN_HEARTBEAT_PERIOD;
   }
 
-  if (options->MinTimeToReportBandwidth < MIN_MIN_TIME_TO_REPORT_BW &&
-  !options->TestingTorNetwork) {
-log_warn(LD_CONFIG, "MinTimeToReportBandwidth is too short; "
- "raising to %d seconds.", MIN_MIN_TIME_TO_REPORT_BW);
-options->MinTimeToReportBandwidth = MIN_MIN_TIME_TO_REPORT_BW;
-  }
-
   if (options->KeepalivePeriod < 1)
 REJECT("KeepalivePeriod option must be positive.");
 
@@ -3994,6 +3987,7 @@ options_validate_cb(const void *old_options_, void 
*options_, char **msg)
 CHECK_DEFAULT(TestingSigningKeySlop);
 CHECK_DEFAULT(TestingAuthKeySlop);
 CHECK_DEFAULT(TestingLinkKeySlop);
+CHECK_DEFAULT(TestingMinTimeToReportBandwidth);
 or_options_free(dflt_options);
   }
 #undef CHECK_DEFAULT
diff --git a/src/app/config/config.h b/src/app/config/config.h
index 74e6942eb5..e95ef4a728 100644
--- a/src/app/config/config.h
+++ b/src/app/config/config.h
@@ -24,13 +24,6 @@
  * expose more information than we're comfortable with. */
 #define MIN_HEARTBEAT_PERIOD (30*60)
 
-/**
- * Lowest allowable value for MinTimeToReportBandwidth on a non-testing
- * network; if this is too low we might report detail that is too
- * fine-grained.
- **/
-#define MIN_MIN_TIME_TO_REPORT_BW (2*60*60)
-

[tor-commits] [tor/maint-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/338' into maint-0.4.5

2021-10-21 Thread ahf

commit 0135fb028c8ca0ce310009f20efef89e53a36f2c
Merge: 5717b88bcb 265cca935a
Author: Alexander FÃ¦rÃ¸y 
Date:   Thu Oct 21 12:35:26 2021 +

Merge remote-tracking branch 'tor-gitlab/mr/338' into maint-0.4.5

 changes/ticket40337| 16 
 doc/man/tor.1.txt  |  5 +
 src/app/config/config.c|  2 ++
 src/app/config/or_options_st.h |  4 
 src/app/config/testnet.inc |  1 +
 src/feature/relay/router.c |  5 -
 src/feature/stats/bwhist.c | 19 ++-
 src/feature/stats/bwhist.h |  2 +-
 src/test/test_relay.c  |  4 ++--
 9 files changed, 49 insertions(+), 9 deletions(-)

___
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] Make MinTimeToReportBandwidth a testing-only option (and rename it)

2021-10-21 Thread ahf

commit 9d7fca2306dc09097a24e225de59fb1ade7c9e34
Author: Nick Mathewson 
Date:   Tue May 11 15:49:00 2021 -0400

Make MinTimeToReportBandwidth a testing-only option (and rename it)
---
 changes/ticket40337|  5 +++--
 doc/man/tor.1.txt  | 12 +---
 src/app/config/config.c| 10 ++
 src/app/config/config.h|  7 ---
 src/app/config/or_options_st.h |  2 +-
 src/app/config/testnet.inc |  2 +-
 src/feature/stats/bwhist.c |  2 +-
 7 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/changes/ticket40337 b/changes/ticket40337
index f8f136a740..02ea29ffc1 100644
--- a/changes/ticket40337
+++ b/changes/ticket40337
@@ -1,5 +1,6 @@
-  o Minor features (bandwidth reporting):
-- Relays can now use the MinTimeToReportBandwidth option to change
+  o Minor features (testing):
+- On a testing network, relays can now use the
+  TestingMinTimeToReportBandwidth option to change
   the smallest amount of time over which they're willing to report
   their observed maximum bandwidth.  Previously, this was fixed
   at 1 day.  For safety, values under 2 hours are only supported on
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt
index af4ee494ef..209900832f 100644
--- a/doc/man/tor.1.txt
+++ b/doc/man/tor.1.txt
@@ -2448,13 +2448,6 @@ is non-zero):
 If we have more onionskins queued for processing than we can process in
 this amount of time, reject new ones. (Default: 1750 msec)
 
-[[MinTimeToReportBandwidth]] **MinTimeToReportBandwidth** __N__ 
**seconds**|**minutes**|**hours**::
-Do not report our measurements for our maximum observed bandwidth for any
-time period that has lasted for less than this amount of time.
-Setting this option too low can enable traffic analysis, and is
-not permitted except on testing networks.  Values over 1 day have
-no effect. (Default: 1 day)
-
 [[MyFamily]] **MyFamily** __fingerprint__,__fingerprint__,...::
 Declare that this Tor relay is controlled or administered by a group or
 organization identical or similar to that of the other relays, defined by
@@ -3602,6 +3595,11 @@ The following options are used for running a testing Tor 
network.
 Minimum value for the Fast flag.  Overrides the ordinary minimum taken
 from the consensus when TestingTorNetwork is set. (Default: 0.)
 
+[[TestingMinTimeToReportBandwidth]] **TestingMinTimeToReportBandwidth** __N__ 
**seconds**|**minutes**|**hours**::
+Do not report our measurements for our maximum observed bandwidth for any
+time period that has lasted for less than this amount of time.
+Values over 1 day have no effect. (Default: 1 day)
+
 [[TestingServerConsensusDownloadInitialDelay]] 
**TestingServerConsensusDownloadInitialDelay** __N__::
 Initial delay in seconds for when servers should download consensuses. 
Changing this
 requires that **TestingTorNetwork** is set. (Default: 0)
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 9011f36735..88da7a0aa7 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -563,7 +563,7 @@ static const config_var_t option_vars_[] = {
   V(MaxUnparseableDescSizeToLog, MEMUNIT, "10 MB"),
   VPORT(MetricsPort),
   V(MetricsPortPolicy,   LINELIST, NULL),
-  V(MinTimeToReportBandwidth,INTERVAL, "1 day"),
+  V(TestingMinTimeToReportBandwidth,INTERVAL, "1 day"),
   VAR("MyFamily",LINELIST, MyFamily_lines,   NULL),
   V(NewCircuitPeriod,INTERVAL, "30 seconds"),
   OBSOLETE("NamingAuthoritativeDirectory"),
@@ -3712,13 +3712,6 @@ options_validate_cb(const void *old_options_, void 
*options_, char **msg)
 options->HeartbeatPeriod = MIN_HEARTBEAT_PERIOD;
   }
 
-  if (options->MinTimeToReportBandwidth < MIN_MIN_TIME_TO_REPORT_BW &&
-  !options->TestingTorNetwork) {
-log_warn(LD_CONFIG, "MinTimeToReportBandwidth is too short; "
- "raising to %d seconds.", MIN_MIN_TIME_TO_REPORT_BW);
-options->MinTimeToReportBandwidth = MIN_MIN_TIME_TO_REPORT_BW;
-  }
-
   if (options->KeepalivePeriod < 1)
 REJECT("KeepalivePeriod option must be positive.");
 
@@ -3994,6 +3987,7 @@ options_validate_cb(const void *old_options_, void 
*options_, char **msg)
 CHECK_DEFAULT(TestingSigningKeySlop);
 CHECK_DEFAULT(TestingAuthKeySlop);
 CHECK_DEFAULT(TestingLinkKeySlop);
+CHECK_DEFAULT(TestingMinTimeToReportBandwidth);
 or_options_free(dflt_options);
   }
 #undef CHECK_DEFAULT
diff --git a/src/app/config/config.h b/src/app/config/config.h
index 74e6942eb5..e95ef4a728 100644
--- a/src/app/config/config.h
+++ b/src/app/config/config.h
@@ -24,13 +24,6 @@
  * expose more information than we're comfortable with. */
 #define MIN_HEARTBEAT_PERIOD (30*60)
 
-/**
- * Lowest allowable value for MinTimeToReportBandwidth on a non-testing
- * network; if this is too low we might report detail that is too
- * fine-grained.
- **/
-#define MIN_MIN_TIME_TO_REPORT_BW (2*60*60)
-

[tor-commits] [tor/maint-0.4.5] Add a MinTimeToReportBandwidth option; make it 0 for testing networks.

2021-10-21 Thread ahf

commit 2ae24d003d1d12e8e202748c4398d7438e4a65d9
Author: Nick Mathewson 
Date:   Wed Mar 17 08:45:37 2021 -0400

Add a MinTimeToReportBandwidth option; make it 0 for testing networks.

This option changes the time for which a bandwidth measurement period
must have been in progress before we include it when reporting our
observed bandwidth in our descriptors.  Without this option, we only
consider a time period towards our maximum if it has been running
for a full day.  Obviously, that's unacceptable for testing
networks, where we'd like to get results as soon as possible.

For non-testing networks, I've put a (somewhat arbitrary) 2-hour
minimum on the option, since there are traffic analysis concerns
with immediate reporting here.

Closes #40337.
---
 changes/ticket40337| 12 
 doc/man/tor.1.txt  |  7 +++
 src/app/config/config.c|  8 
 src/app/config/config.h|  7 +++
 src/app/config/or_options_st.h |  4 
 src/app/config/testnet.inc |  1 +
 src/feature/stats/bwhist.c | 19 ++-
 src/feature/stats/bwhist.h |  2 +-
 src/test/test_relay.c  |  4 ++--
 9 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/changes/ticket40337 b/changes/ticket40337
new file mode 100644
index 00..f8f136a740
--- /dev/null
+++ b/changes/ticket40337
@@ -0,0 +1,12 @@
+  o Minor features (bandwidth reporting):
+- Relays can now use the MinTimeToReportBandwidth option to change
+  the smallest amount of time over which they're willing to report
+  their observed maximum bandwidth.  Previously, this was fixed
+  at 1 day.  For safety, values under 2 hours are only supported on
+  testing networks. Part of a fix for ticket 40337.
+
+  o Minor features (testing):
+- Relays on testing networks now report their observed bandwidths
+  immediately from startup.  Previously, they waited
+  until they had been running for a full day.   Closes ticket
+  40337.
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt
index b57c6ec70a..af4ee494ef 100644
--- a/doc/man/tor.1.txt
+++ b/doc/man/tor.1.txt
@@ -2448,6 +2448,13 @@ is non-zero):
 If we have more onionskins queued for processing than we can process in
 this amount of time, reject new ones. (Default: 1750 msec)
 
+[[MinTimeToReportBandwidth]] **MinTimeToReportBandwidth** __N__ 
**seconds**|**minutes**|**hours**::
+Do not report our measurements for our maximum observed bandwidth for any
+time period that has lasted for less than this amount of time.
+Setting this option too low can enable traffic analysis, and is
+not permitted except on testing networks.  Values over 1 day have
+no effect. (Default: 1 day)
+
 [[MyFamily]] **MyFamily** __fingerprint__,__fingerprint__,...::
 Declare that this Tor relay is controlled or administered by a group or
 organization identical or similar to that of the other relays, defined by
diff --git a/src/app/config/config.c b/src/app/config/config.c
index fa74907b3d..9011f36735 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -563,6 +563,7 @@ static const config_var_t option_vars_[] = {
   V(MaxUnparseableDescSizeToLog, MEMUNIT, "10 MB"),
   VPORT(MetricsPort),
   V(MetricsPortPolicy,   LINELIST, NULL),
+  V(MinTimeToReportBandwidth,INTERVAL, "1 day"),
   VAR("MyFamily",LINELIST, MyFamily_lines,   NULL),
   V(NewCircuitPeriod,INTERVAL, "30 seconds"),
   OBSOLETE("NamingAuthoritativeDirectory"),
@@ -3711,6 +3712,13 @@ options_validate_cb(const void *old_options_, void 
*options_, char **msg)
 options->HeartbeatPeriod = MIN_HEARTBEAT_PERIOD;
   }
 
+  if (options->MinTimeToReportBandwidth < MIN_MIN_TIME_TO_REPORT_BW &&
+  !options->TestingTorNetwork) {
+log_warn(LD_CONFIG, "MinTimeToReportBandwidth is too short; "
+ "raising to %d seconds.", MIN_MIN_TIME_TO_REPORT_BW);
+options->MinTimeToReportBandwidth = MIN_MIN_TIME_TO_REPORT_BW;
+  }
+
   if (options->KeepalivePeriod < 1)
 REJECT("KeepalivePeriod option must be positive.");
 
diff --git a/src/app/config/config.h b/src/app/config/config.h
index e95ef4a728..74e6942eb5 100644
--- a/src/app/config/config.h
+++ b/src/app/config/config.h
@@ -24,6 +24,13 @@
  * expose more information than we're comfortable with. */
 #define MIN_HEARTBEAT_PERIOD (30*60)
 
+/**
+ * Lowest allowable value for MinTimeToReportBandwidth on a non-testing
+ * network; if this is too low we might report detail that is too
+ * fine-grained.
+ **/
+#define MIN_MIN_TIME_TO_REPORT_BW (2*60*60)
+
 /** Maximum default value for MaxMemInQueues, in bytes. */
 #if SIZEOF_VOID_P >= 8
 #define MAX_DEFAULT_MEMORY_QUEUE_SIZE (UINT64_C(8) << 30)
diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h
index 4364f145ed..efecc85d66 100644
--- a/src/app/config/or_options_st.h
+++

[tor-commits] [tor/main] Merge branch 'maint-0.4.6' into main

2021-10-21 Thread ahf

commit 998706c6119d66509978721c29e10495c2bdc16f
Merge: 059ea671ed bd1c14f015
Author: Alexander FÃ¦rÃ¸y 
Date:   Thu Oct 21 12:35:36 2021 +

Merge branch 'maint-0.4.6' into main

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

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

2021-10-21 Thread ahf

commit bd1c14f0156c4d166ed1706544242e31d7ddceff
Merge: 1e08efdb58 0135fb028c
Author: Alexander FÃ¦rÃ¸y 
Date:   Thu Oct 21 12:35:36 2021 +

Merge branch 'maint-0.4.5' into maint-0.4.6

 changes/ticket40337| 16 
 doc/man/tor.1.txt  |  5 +
 src/app/config/config.c|  2 ++
 src/app/config/or_options_st.h |  4 
 src/app/config/testnet.inc |  1 +
 src/feature/relay/router.c |  5 -
 src/feature/stats/bwhist.c | 19 ++-
 src/feature/stats/bwhist.h |  2 +-
 src/test/test_relay.c  |  4 ++--
 9 files changed, 49 insertions(+), 9 deletions(-)




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

[tor-commits] [tor/main] Merge remote-tracking branch 'tor-gitlab/mr/338' into maint-0.4.5

2021-10-21 Thread ahf

commit 0135fb028c8ca0ce310009f20efef89e53a36f2c
Merge: 5717b88bcb 265cca935a
Author: Alexander FÃ¦rÃ¸y 
Date:   Thu Oct 21 12:35:26 2021 +

Merge remote-tracking branch 'tor-gitlab/mr/338' into maint-0.4.5

 changes/ticket40337| 16 
 doc/man/tor.1.txt  |  5 +
 src/app/config/config.c|  2 ++
 src/app/config/or_options_st.h |  4 
 src/app/config/testnet.inc |  1 +
 src/feature/relay/router.c |  5 -
 src/feature/stats/bwhist.c | 19 ++-
 src/feature/stats/bwhist.h |  2 +-
 src/test/test_relay.c  |  4 ++--
 9 files changed, 49 insertions(+), 9 deletions(-)




___
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-10-21 Thread translation

commit 5e5cbea1958e25292f7e7c476d785c40ab4e304d
Author: Translation commit bot 
Date:   Thu Oct 21 12:18:02 2021 +

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

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index 75fb511951..697e0f9a3e 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -19,13 +19,13 @@
 # Henrique Casellato, 2021
 # erinm, 2021
 # AndrÃ© Abou Chami Campana , 2021
-# Emma Peel, 2021
 # JosÃ© Ricardo dos Santos JÃºnior , 2021
 # blueboy, 2021
 # Gus, 2021
 # Eduardo Addad de Oliveira , 2021
 # C. E., 2021
 # Alexei GonÃ§alves de Oliveira , 2021
+# Emma Peel, 2021
 # 
 msgid ""
 msgstr ""
@@ -33,7 +33,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-21 10:31+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Alexei GonÃ§alves de Oliveira , 
2021\n"
+"Last-Translator: Emma Peel, 2021\n"
 "Language-Team: Portuguese (Brazil) 
(https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1777,7 +1777,7 @@ msgstr ""
 #: https//support.torproject.org/glossary/relay/
 #: (content/glossary/relay/contents+en.lrword.term)
 msgid "relay"
-msgstr "retransmitir"
+msgstr "retransmissor"
 
 #: https//support.torproject.org/glossary/relay/
 #: (content/glossary/relay/contents+en.lrword.definition)

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

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

2021-10-21 Thread translation

commit 4987f0f4112580a7c9e9552148fc8e88511c2e79
Author: Translation commit bot 
Date:   Thu Oct 21 12:15:13 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+es.po | 41 +
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index 3462dccc45..eaa1fb543f 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -14,8 +14,8 @@
 # ÄorÄe MaruÅ¡iÄ , 2021
 # erinm, 2021
 # Zuhualime Akoochimoya, 2021
-# Emma Peel, 2021
 # de1ca222968aa9b5291789e94a1b3b8a_f1329af, 2021
+# Emma Peel, 2021
 # 
 msgid ""
 msgstr ""
@@ -23,7 +23,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-21 11:36+CET\n"
 "PO-Revision-Date: 2019-12-11 10:50+\n"
-"Last-Translator: de1ca222968aa9b5291789e94a1b3b8a_f1329af, 2021\n"
+"Last-Translator: Emma Peel, 2021\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -8712,8 +8712,8 @@ msgid ""
 "This way attackers will have to solve Captchas before they are able to "
 "attack deeper into your infrastructure."
 msgstr ""
-"De esta manera, los atacantes tendrÃ¡n que resolver Captchas antes de ser "
-"capaces de atacar mÃ¡s profundo dentro de tu infraestructura."
+"De esta manera, los atacantes tendrÃ¡n que resolver Captchas antes de poder "
+"atacar mÃ¡s adentro de tu infraestructura."
 
 #: https//community.torproject.org/onion-services/advanced/dos/
 #: (content/onion-services/advanced/dos/contents+en.lrpage.body)
@@ -9755,7 +9755,7 @@ msgstr ""
 #: https//community.torproject.org/onion-services/advanced/https/
 #: (content/onion-services/advanced/https/contents+en.lrpage.body)
 msgid "### What's next"
-msgstr "### QuÃ© es lo que sigue"
+msgstr "### QuÃ© se avecina"
 
 #: https//community.torproject.org/onion-services/advanced/https/
 #: (content/onion-services/advanced/https/contents+en.lrpage.body)
@@ -9818,8 +9818,8 @@ msgid ""
 "opportunities)"
 msgstr ""
 "* [El Navegador Tor y los Servicios Cebolla - DesafÃos y Oportunidades "
-"(2020)](https://blog.torproject.org/tor-brower-onion-services-challenges-;
-"opportunities)"
+"(2020, en inglÃ©s)](https://blog.torproject.org/tor-brower-onion-services-;
+"challenges-opportunities)"
 
 #: https//community.torproject.org/onion-services/advanced/https/
 #: (content/onion-services/advanced/https/contents+en.lrpage.body)
@@ -11306,8 +11306,8 @@ msgid ""
 "approach taken by Gmail for this same problem."
 msgstr ""
 "Las actividades de extracciÃ³n de datos y robots pueden ser "
-"reducidas/desaceleradas por Captchas, el cual es el abordaje tomado por "
-"Gmail para este mismo problema."
+"reducidas/desaceleradas por Captchas, que es lo que hace Gmail para este "
+"mismo problema."
 
 #: 
https//community.torproject.org/relay/community-resources/tor-abuse-templates/
 #: 
(content/relay/community-resources/tor-abuse-templates/contents+en.lrpage.body)
@@ -11931,8 +11931,8 @@ msgid ""
 "Learn how to report relays that either doesn't work properly or tampers with"
 " our users' connections"
 msgstr ""
-"Aprende como reportar repetidores que o bien no funcionan apropiadamente, o "
-"interfieren con las conexiones de nuestros usuarios."
+"Aprende como reportar repetidores que, o bien no funcionan apropiadamente, o"
+" interfieren con las conexiones de nuestros usuarios."
 
 #: https//community.torproject.org/relay/community-resources/bad-relays/
 #: (content/relay/community-resources/bad-relays/contents+en.lrpage.body)
@@ -12422,7 +12422,8 @@ msgstr ""
 #: 
https//community.torproject.org/relay/community-resources/tor-exit-guidelines/
 #: 
(content/relay/community-resources/tor-exit-guidelines/contents+en.lrpage.body)
 msgid "1. Ask if the ISP is okay with a Tor exit"
-msgstr "1. Pregunta al ISP tiene problemas con las salidas de Tor"
+msgstr ""
+"1. Pregunta al proveedor de Internet tiene problemas con las salidas de Tor"
 
 #: 
https//community.torproject.org/relay/community-resources/tor-exit-guidelines/
 #: 
(content/relay/community-resources/tor-exit-guidelines/contents+en.lrpage.body)
@@ -17350,7 +17351,7 @@ msgid ""
 
"[ReducedExitPolicy](https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy)"
 " wiki page."
 msgstr ""
-"La polÃtitca de salida reducida puede verse en la pÃ¡gina wiki "
+"La polÃtica de salida reducida puede verse en la pÃ¡gina wiki "
 
"[PolÃticadeSalidaReducida](https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy)."
 
 #: https//community.torproject.org/relay/setup/exit/
@@ -17956,8 +17957,8 @@ msgstr ""
 "estoy alojando los materiales supuestamente en infracciÃ³n, y aÃºn mÃ¡s, las "
 "salvaguardias de la Ley de Derechos de Autor del Milenio Digital (\"DMCA\") "
 "probablemente le protegen de la responsabilidad que surge de esta queja. La "
-"misiva probablemente estÃ¡ basada en malentendidos acerca de la ley, y algo "
-"del software que

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

2021-10-21 Thread translation

commit 4b33b1d4fa66373b41531989b6ad4b9e63e3e787
Author: Translation commit bot 
Date:   Thu Oct 21 11:49:02 2021 +

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

diff --git a/contents+es.po b/contents+es.po
index f7f271f2e7..db8285226c 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -9196,7 +9196,7 @@ msgstr "Si, consigues mejor protecciÃ³n frente a ciertos 
ataques."
 msgid ""
 "The simplest example is an attacker who owns a small number of Tor relays."
 msgstr ""
-"El ejemplo mÃ¡s sencillo esun atacante que maneja un pequeÃ±o nÃºmero de "
+"El ejemplo mÃ¡s sencillo es un atacante que maneja un pequeÃ±o nÃºmero de "
 "repetidores Tor."
 
 #: https//support.torproject.org/relay-operators/better-anonymity/
@@ -9511,7 +9511,7 @@ msgid ""
 "This way each relay can decide the services, hosts, and networks it wants to"
 " allow connections to, based on abuse potential and its own situation."
 msgstr ""
-"Des esta forma cada repetidor puede elegir que servicios, destinos y redes "
+"De esta forma cada repetidor puede elegir que servicios, destinos y redes "
 "quiere permitir, basÃ¡ndose en el potencial para el abuso o en otros "
 "criterios."
 
@@ -9634,7 +9634,7 @@ msgid ""
 " apply to both client and relay functions of the Tor process."
 msgstr ""
 "Los parÃ¡metros asignados a "
-"AccountingMax](https://2019.www.torproject.org/docs/faq.html.en#LimitTotalBandwidth)"
+"[AccountingMax](https://2019.www.torproject.org/docs/faq.html.en#LimitTotalBandwidth)"
 " y "
 
"[BandwidthRate](https://2019.www.torproject.org/docs/faq.html.en#BandwidthShaping)"
 " se aplican tanto a las funciones de repetidor como a las de cliente del "

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

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

2021-10-21 Thread translation

commit 2fd3795f944f6ae34e1db75cafdccba85d0e6976
Author: Translation commit bot 
Date:   Thu Oct 21 11:46:28 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot_completed
---
 contents+tr.po | 54 ++
 contents.pot   | 51 ++-
 2 files changed, 68 insertions(+), 37 deletions(-)

diff --git a/contents+tr.po b/contents+tr.po
index 1b20bd4e6c..80c3c9b2bd 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -5,22 +5,21 @@
 # uskumru, 2020
 # BarÄ±Å , 2020
 # yunus kaba , 2021
-# Gus, 2021
 # dersteppenwolfx, 2021
 # IDRASSI Mounir , 2021
 # T. E. Kalayci , 2021
 # escher , 2021
 # erinm, 2021
-# Emma Peel, 2021
 # Kaya Zeren , 2021
+# Emma Peel, 2021
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 07:32+CET\n"
+"POT-Creation-Date: 2021-10-21 11:36+CET\n"
 "PO-Revision-Date: 2019-12-11 10:50+\n"
-"Last-Translator: Kaya Zeren , 2021\n"
+"Last-Translator: Emma Peel, 2021\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20262,8 +20261,20 @@ msgstr "### 2. KapsayÄ±cÄ±yÄ± gÃ¼ncelleyin"
 
 #: https//community.torproject.org/relay/setup/bridge/docker/
 #: (content/relay/setup/bridge/docker/contents+en.lrpage.body)
-msgid "Upgrading to the latest version of our image is as simple as running:"
-msgstr "Åu komut ile son kalÄ±p sÃ¼rÃ¼mÃ¼ne kolayca gÃ¼ncellenebilir:"
+msgid ""
+"Upgrading to the latest version of our image is as simple as pulling the "
+"latest version of the image running:"
+msgstr ""
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay/setup/bridge/docker/contents+en.lrpage.body)
+msgid "`docker-compose pull obfs4-bridge`"
+msgstr ""
+
+#: https//community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay/setup/bridge/docker/contents+en.lrpage.body)
+msgid "And then restarting the container:"
+msgstr ""
 
 #: https//community.torproject.org/relay/setup/bridge/docker/
 #: (content/relay/setup/bridge/docker/contents+en.lrpage.body)
@@ -22526,28 +22537,24 @@ msgid "Close banner"
 msgstr "AfiÅi kaldÄ±r"
 
 #: lego/templates/banner.html:11 templates/banner.html:11
-msgid "Use a Mask, Use Tor."
-msgstr "Maske kullanÄ±n, Tor kullanÄ±n."
+msgid "Privacy is a human right"
+msgstr ""
 
-#: lego/templates/banner.html:20 templates/banner.html:20
-msgid "Resist the surveillance pandemic."
-msgstr "Ä°zleme salgÄ±nÄ±ndan korunun."
+#: lego/templates/banner.html:15 templates/banner.html:15
+msgid "Your donation will be matched by Friends of Tor, up to $150,000."
+msgstr ""
 
-#: lego/templates/banner.html:32 templates/banner.html:32
+#: lego/templates/banner.html:26 templates/banner.html:26
 msgid "Your donation will be matched by Friends of Tor, up to $100,000."
 msgstr ""
 "Friends of Tor, $100.000 tutarÄ±nÄ± aÅmayan baÄÄ±ÅlarÄ±nÄ±z kadar katkÄ±da 
"
 "bulunacak."
 
-#: lego/templates/banner.html:38 lego/templates/footer.html:64
-#: lego/templates/footer.html:66 lego/templates/navbar.html:18
-#: lego/templates/navbar.html:20 templates/banner.html:38
-#: templates/footer.html:64 templates/footer.html:66 templates/navbar.html:18
-#: templates/navbar.html:20
-msgid "Donate Now"
-msgstr "BaÄÄ±Å YapÄ±n"
+#: lego/templates/banner.html:32 templates/banner.html:32
+msgid "Donate now"
+msgstr ""
 
-#: lego/templates/banner.html:40 templates/banner.html:40
+#: lego/templates/banner.html:34 templates/banner.html:34
 msgid "DONATE NOW"
 msgstr "BAÄIÅ YAPIN"
 
@@ -22590,6 +22597,13 @@ msgstr ""
 msgid "Donate"
 msgstr "BaÄÄ±Å YapÄ±n"
 
+#: lego/templates/footer.html:64 lego/templates/footer.html:66
+#: lego/templates/navbar.html:18 lego/templates/navbar.html:20
+#: templates/footer.html:64 templates/footer.html:66 templates/navbar.html:18
+#: templates/navbar.html:20
+msgid "Donate Now"
+msgstr "BaÄÄ±Å YapÄ±n"
+
 #: lego/templates/footer.html:75 templates/footer.html:75
 msgid "Subscribe to our Newsletter"
 msgstr "DuyurularÄ±mÄ±za Abone Olun"
diff --git a/contents.pot b/contents.pot
index fe684da39a..8e308b17e3 100644
--- a/contents.pot
+++ b/contents.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 07:32+CET\n"
+"POT-Creation-Date: 2021-10-21 11:36+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -19859,8 +19859,22 @@ msgstr "### 2. Upgrade your container"
 
 #: https//community.torproject.org/relay/setup/bridge/docker/
 #: (content/relay/setup/bridge/docker/contents+en.lrpage.body)
-msgid "Upgrading to the latest version of our image is as simple as running:"
-msgstr "Upgrading to the latest version of our image is as simple as running:"
+msgid ""
+"Upgrading to the latest version of our image is as

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

2021-10-21 Thread translation

commit 84270fb370d7ba591abbd0db8594fc66acc32187
Author: Translation commit bot 
Date:   Thu Oct 21 10:48:17 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=support-portal_completed
---
 contents+tr.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contents+tr.po b/contents+tr.po
index 533b4d12a1..0a3396abc8 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -4,8 +4,8 @@
 # 0d1bdb3b9a0d4e8f77bc854af8bf3dfc_e6913f4, 2020
 # T. E. Kalayci , 2021
 # erinm, 2021
-# Emma Peel, 2021
 # Kaya Zeren , 2021
+# Emma Peel, 2021
 # 
 msgid ""
 msgstr ""
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-21 10:31+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Kaya Zeren , 2021\n"
+"Last-Translator: Emma Peel, 2021\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -10523,12 +10523,12 @@ msgstr ""
 #: https//support.torproject.org/relay-operators/operators-4/
 #: (content/relay-operators/operators-4/contents+en.lrquestion.description)
 msgid "deb https://deb.torproject.org/torproject.org version main"
-msgstr ""
+msgstr "deb https://deb.torproject.org/torproject.org version main"
 
 #: https//support.torproject.org/relay-operators/operators-4/
 #: (content/relay-operators/operators-4/contents+en.lrquestion.description)
 msgid "deb-src https://deb.torproject.org/torproject.org version main"
-msgstr ""
+msgstr "deb-src https://deb.torproject.org/torproject.org version main"
 
 #: https//support.torproject.org/relay-operators/operators-4/
 #: (content/relay-operators/operators-4/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/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2021-10-21 Thread translation

commit 7100aad16355a45dbcf8d708a02317b7bba916b2
Author: Translation commit bot 
Date:   Thu Oct 21 10:48:13 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+ar.po | 46 +-
 contents+es.po | 28 
 contents+tr.po | 46 +++---
 3 files changed, 84 insertions(+), 36 deletions(-)

diff --git a/contents+ar.po b/contents+ar.po
index 747d03727d..ffc5713a3e 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -13,9 +13,9 @@
 # Muhammad Elghdban , 2020
 # erinm, 2021
 # William Ward , 2021
-# Emma Peel, 2021
 # Ahmed A., 2021
 # NASIâ¿ , 2021
+# Emma Peel, 2021
 # 
 msgid ""
 msgstr ""
@@ -23,7 +23,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-21 10:31+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: NASIâ¿ , 2021\n"
+"Last-Translator: Emma Peel, 2021\n"
 "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1133,6 +1133,11 @@ msgid ""
 "public Tor network and related services, and assists in developing novel "
 "approaches to safe, privacy preserving data collection."
 msgstr ""
+"[Tor Metrics](https://metrics.torproject.org/) "
+"([.onion](http://hctxrvjzfpvmzh2jllqhgvvkoepxb4kfzdjm6h7egcwlumggtktiftid.onion/))"
+" Ø£Ø±Ø´ÙØ© Ø§ÙØ¨ÙØ§ÙØ§Øª Ø§ÙØªØ§Ø±ÙØ®ÙØ© ØÙÙ ÙØ¸Ø§Ù Tor 
Ø§ÙØ¨ÙØ¦Ù Ø ÙØ¬ÙØ¹ Ø§ÙØ¨ÙØ§ÙØ§Øª ÙÙ Ø´Ø¨ÙØ© Tor "
+"Ø§ÙØ¹Ø§ÙØ© ÙØ§ÙØ®Ø¯ÙØ§Øª Ø°Ø§Øª Ø§ÙØµÙØ© Ø ÙÙØ³Ø§Ø¹Ø¯ ÙÙ 
ØªØ·ÙÙØ± ÙÙØ§ÙØ¬ Ø¬Ø¯ÙØ¯Ø© ÙØ¬ÙØ¹ Ø§ÙØ¨ÙØ§ÙØ§Øª Ø§ÙØ¢ÙÙØ©"
+" ÙØ§ÙÙØØ§ÙØ¸Ø© Ø¹ÙÙ Ø§ÙØ®ØµÙØµÙØ©."
 
 #: https//support.torproject.org/glossary/middle-relay/
 #: (content/glossary/middle-relay/contents+en.lrword.term)
@@ -2239,9 +2244,9 @@ msgid ""
 "/hamburger-menu), then click on \"Preferences\", and finally on \"Tor\" in "
 "the side bar."
 msgstr ""
-"Ø¥Ø°Ø§ ÙÙØª ÙØ§ ØªØ±Ù ÙØ°Ø§ Ø§ÙØ®ÙØ§Ø± ÙÙØ§Ù ÙØ¯ÙÙ [Tor 
Browser](../ tor-browser) ÙÙØªÙØÙØ§ Ø"
-" ÙÙÙÙÙ Ø§ÙØ§ÙØªÙØ§Ù Ø¥ÙÙ [ÙØ§Ø¦ÙØ© Ø§ÙÙØ§ÙØ¨Ø±ØºØ± 
(\"â¡\")](../ glossary / hamburger-menu)"
-" Ø Ø«Ù Ø§ÙÙØ± Ø¹ÙÙ \"Ø§ÙØªÙØ¶ÙÙØ§Øª\" Ø ÙØ£Ø®ÙØ±ÙØ§ Ø¹ÙÙ 
\"Tor\" ÙÙ Ø§ÙØ´Ø±ÙØ· Ø§ÙØ¬Ø§ÙØ¨Ù."
+"Ø¥Ø°Ø§ ÙÙØª ÙØ§ ØªØ±Ù ÙØ°Ø§ Ø§ÙØ®ÙØ§Ø± ÙÙØ§Ù ÙØ¯ÙÙ [Tor 
Browser](../tor-browser) ÙÙØªÙØÙØ§ Ø "
+"ÙÙÙÙÙ Ø§ÙØ§ÙØªÙØ§Ù Ø¥ÙÙ [ÙØ§Ø¦ÙØ© Ø§ÙÙØ§ÙØ¨Ø±ØºØ± 
(\"â¡\")](../glossary/hamburger-menu) Ø "
+"Ø«Ù Ø§ÙÙØ± Ø¹ÙÙ \"Ø§ÙØªÙØ¶ÙÙØ§Øª\" Ø ÙØ£Ø®ÙØ±ÙØ§ Ø¹ÙÙ \"Tor\" 
ÙÙ Ø§ÙØ´Ø±ÙØ· Ø§ÙØ¬Ø§ÙØ¨Ù."
 
 #: https//support.torproject.org/glossary/tor-log/
 #: (content/glossary/tor-log/contents+en.lrword.definition)
@@ -2656,7 +2661,7 @@ msgstr "- Ø¢ÙÙ: [ÙØªØµÙØ 
Tor](https://www.torproject.org/download/)"
 msgid ""
 "- Unsafe: [Any other browser configured to use Tor as a "
 "proxy](../../tbb/tbb-9/)"
-msgstr ""
+msgstr "- ØºÙØ± Ø¢ÙÙ: [Ø£Ù ÙØªØµÙØ Ø¢Ø®Ø± ÙÙÙØ£ ÙØ§Ø³ØªØ®Ø¯Ø§Ù Tor 
ÙÙÙÙÙ](../../tbb/tbb-9)"
 
 #: https//support.torproject.org/faq/staying-anonymous/
 #: (content/faq/staying-anonymous/contents+en.lrquestion.description)
@@ -3844,7 +3849,7 @@ msgstr ""
 #: https//support.torproject.org/about/key-management/
 #: (content/about/key-management/contents+en.lrquestion.description)
 msgid "### How do clients know what the directory authorities are?"
-msgstr ""
+msgstr "### ÙÙÙ ÙØ¹Ø±Ù Ø§ÙØ¹ÙÙØ§Ø¡ ÙØ§ ÙÙ Ø³ÙØ·Ø§Øª Ø§ÙØ¯ÙÙÙØ"
 
 #: https//support.torproject.org/about/key-management/
 #: (content/about/key-management/contents+en.lrquestion.description)
@@ -3865,7 +3870,7 @@ msgstr ""
 #: https//support.torproject.org/about/key-management/
 #: (content/about/key-management/contents+en.lrquestion.description)
 msgid "### How do users know they've got the right software?"
-msgstr ""
+msgstr "### ÙÙÙ ÙØ¹Ø±Ù Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙ Ø£Ù ÙØ¯ÙÙÙ Ø§ÙØ¨Ø±ÙØ§Ù
Ø¬ Ø§ÙÙÙØ§Ø³Ø¨Ø"
 
 #: https//support.torproject.org/about/key-management/
 #: (content/about/key-management/contents+en.lrquestion.description)
@@ -5698,7 +5703,7 @@ msgid ""
 "finally on \"Tor\" in the side bar."
 msgstr ""
 "Ø¹ÙØ¯ÙØ§ ÙÙÙÙ ÙØªØµÙØ Tor ÙÙØªÙØÙØ§ Ø ÙÙÙÙÙ 
Ø§ÙØ§ÙØªÙØ§Ù Ø¥ÙÙ [ÙØ§Ø¦ÙØ© Ø§ÙÙØ§ÙØ¨Ø±ØºØ± "
-"(\"â¡\")](../../ Ø§ÙÙØ³Ø±Ø¯ / ÙØ§Ø¦ÙØ© Ø§ÙÙØ§ÙØ¨Ø±ØºØ±) Ø Ø«Ù 
Ø§ÙÙÙØ± Ø¹ÙÙ \"Ø§ÙØªÙØ¶ÙÙØ§Øª\" Ø "
+"(\"â¡\")](../../glossary/hamburger-menu) Ø Ø«Ù Ø§ÙÙÙØ± Ø¹ÙÙ 
\"Ø§ÙØªÙØ¶ÙÙØ§Øª\" Ø "
 "ÙØ£Ø®ÙØ±Ø§Ù Ø¹ÙÙ \"Tor\" ÙÙ Ø´Ø±ÙØ· Ø¬Ø§ÙØ¨Ù."
 
 #: https//support.torproject.org/tbb/tbb-21/
@@ -5933,8 +5938,8 @@ msgid ""
 "Both options are located in the [hamburger menu (\"â¡\")](../../glossary"
 "/hamburger-menu)."
 msgstr ""
-"ÙÙØ¬Ø¯ ÙÙØ§ Ø§ÙØ®ÙØ§Ø±ÙÙ ÙÙ [ÙØ§Ø¦ÙØ© Ø§ÙÙØ§ÙØ¨Ø±ØºØ± 
(\"\")](../../ Ø§ÙÙØ³Ø±Ø¯ / ÙØ§Ø¦ÙØ© "
-"Ø§ÙÙØ§ÙØ¨Ø±ØºØ±)."
+"ÙÙØ¬Ø¯

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

2021-10-21 Thread translation

commit 55edf3ab0bf8a21a78860f5c11da98c7c81f193f
Author: Translation commit bot 
Date:   Thu Oct 21 09:48:21 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+es.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index b4cedee786..e34c2d116c 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -8716,7 +8716,7 @@ msgid ""
 msgstr ""
 "Como alternativa, puedes escribir `about:preferences#tor` en la barra de "
 "direcciones. Marca 'Usar un puente' y 'Seleccionar un puente "
-"predeterminado'. DespuÃ©s seleccionar 'Snowflake' del menÃº desplegable."
+"predeterminado'. DespuÃ©s selecciona 'Snowflake' del menÃº desplegable."
 
 #: https//support.torproject.org/censorship/how-to-help-running-snowflake/
 #: 
(content/censorship/how-to-help-running-snowflake/contents+en.lrquestion.title)
@@ -9078,7 +9078,7 @@ msgid ""
 "comfortable."
 msgstr ""
 "De otro modo, podrÃas sufrir pÃ©rdida de paquetes durante los periodos de "
-"mÃ¡ximo uso del ancho de banda. Puede que tengas que jugar con estos valores "
+"mÃ¡ximo uso de ancho de banda. Puede que tengas que jugar con estos valores "
 "hasta que consigas un uso adecuado de tu conexiÃ³n."
 
 #: https//support.torproject.org/relay-operators/bandwidth-shaping/

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

[tor-commits] [community/translations] update lego

2021-10-21 Thread emmapeel

commit 2bb89d5b9a3c586bc796eda39518a680ab943461
Author: emma peel 
Date:   Thu Oct 21 11:42:51 2021 +0200

update lego
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index 96effb7..8bbc491 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 96effb77f3538a99f9b0198d6ff8a63228c5ac37
+Subproject commit 8bbc49137960f1e05654b65cdd65ae298cf5cb20

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

[tor-commits] [community/translations] Update lego

2021-10-21 Thread emmapeel

commit 5e37c1bb3be7ab07449476144aeb3a5f2ae458b8
Author: gus 
Date:   Tue Oct 12 09:10:33 2021 -0300

Update lego
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index 5db6fa6..96effb7 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 5db6fa6df1871a3ded1ba00530fccbb2cd74b87b
+Subproject commit 96effb77f3538a99f9b0198d6ff8a63228c5ac37



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

[tor-commits] [community/translations] content updates

2021-10-21 Thread emmapeel

commit b0abebdcea1b6187ba2a1a5ead48890f89986d1b
Author: emma peel 
Date:   Thu Oct 21 10:55:35 2021 +0200

content updates
---
 content/relay/setup/bridge/docker/contents.lr | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/content/relay/setup/bridge/docker/contents.lr 
b/content/relay/setup/bridge/docker/contents.lr
index a3d1e0a..a849385 100644
--- a/content/relay/setup/bridge/docker/contents.lr
+++ b/content/relay/setup/bridge/docker/contents.lr
@@ -37,7 +37,11 @@ That's it! Your container is now bootstrapping your new 
obfs4 bridge.
 
 ### 2. Upgrade your container
 
-Upgrading to the latest version of our image is as simple as running:
+Upgrading to the latest version of our image is as simple as pulling the 
latest version of the image running:
+
+`docker-compose pull obfs4-bridge`
+
+And then restarting the container:
 
 `docker-compose up -d obfs4-bridge`
 



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

[tor-commits] [community/translations] update translation file

2021-10-21 Thread emmapeel

commit 53e1dd4c44cae6be90b68224fac2d2a9a697d539
Author: emma peel 
Date:   Thu Oct 21 11:41:17 2021 +0200

update translation file
---
 i18n/contents.pot | 41 -
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/i18n/contents.pot b/i18n/contents.pot
index 2019bb2..ec8d99a 100644
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 07:32+CET\n"
+"POT-Creation-Date: 2021-10-21 11:36+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -16246,7 +16246,19 @@ msgstr ""
 
 #: https://community.torproject.org/relay/setup/bridge/docker/
 #: (content/relay/setup/bridge/docker/contents+en.lr:page.body)
-msgid "Upgrading to the latest version of our image is as simple as running:"
+msgid ""
+"Upgrading to the latest version of our image is as simple as pulling the "
+"latest version of the image running:"
+msgstr ""
+
+#: https://community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay/setup/bridge/docker/contents+en.lr:page.body)
+msgid "`docker-compose pull obfs4-bridge`"
+msgstr ""
+
+#: https://community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay/setup/bridge/docker/contents+en.lr:page.body)
+msgid "And then restarting the container:"
 msgstr ""
 
 #: https://community.torproject.org/relay/setup/bridge/docker/
@@ -18286,26 +18298,22 @@ msgid "Close banner"
 msgstr ""
 
 #: lego/templates/banner.html:11 templates/banner.html:11
-msgid "Use a Mask, Use Tor."
+msgid "Privacy is a human right"
 msgstr ""
 
-#: lego/templates/banner.html:20 templates/banner.html:20
-msgid "Resist the surveillance pandemic."
+#: lego/templates/banner.html:15 templates/banner.html:15
+msgid "Your donation will be matched by Friends of Tor, up to $150,000."
 msgstr ""
 
-#: lego/templates/banner.html:32 templates/banner.html:32
+#: lego/templates/banner.html:26 templates/banner.html:26
 msgid "Your donation will be matched by Friends of Tor, up to $100,000."
 msgstr ""
 
-#: lego/templates/banner.html:38 lego/templates/footer.html:64
-#: lego/templates/footer.html:66 lego/templates/navbar.html:18
-#: lego/templates/navbar.html:20 templates/banner.html:38
-#: templates/footer.html:64 templates/footer.html:66 templates/navbar.html:18
-#: templates/navbar.html:20
-msgid "Donate Now"
+#: lego/templates/banner.html:32 templates/banner.html:32
+msgid "Donate now"
 msgstr ""
 
-#: lego/templates/banner.html:40 templates/banner.html:40
+#: lego/templates/banner.html:34 templates/banner.html:34
 msgid "DONATE NOW"
 msgstr ""
 
@@ -18341,6 +18349,13 @@ msgstr ""
 msgid "Donate"
 msgstr ""
 
+#: lego/templates/footer.html:64 lego/templates/footer.html:66
+#: lego/templates/navbar.html:18 lego/templates/navbar.html:20
+#: templates/footer.html:64 templates/footer.html:66 templates/navbar.html:18
+#: templates/navbar.html:20
+msgid "Donate Now"
+msgstr ""
+
 #: lego/templates/footer.html:75 templates/footer.html:75
 msgid "Subscribe to our Newsletter"
 msgstr ""

___
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-10-21 Thread translation

commit 67f376154b762fed8ad4da0640ab57c6c688cef1
Author: Translation commit bot 
Date:   Thu Oct 21 09:17:49 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+es.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index 59f5fb1f77..b4cedee786 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -3362,8 +3362,8 @@ msgid ""
 "Essentially this means that you need to include our LICENSE file along with "
 "whatever part of the Tor software you're distributing."
 msgstr ""
-"Resumiendo, esto significa que debes incluir el texto de nuestra licencia "
-"con la parte de Tor que estÃ©s distribuyendo."
+"Resumiendo, esto significa que debes incluir el archivo LICENSE de nuestra "
+"licencia con la parte de Tor que estÃ©s distribuyendo."
 
 #: https//support.torproject.org/about/distribute-tor/
 #: (content/about/distribute-tor/contents+en.lrquestion.description)
@@ -8409,7 +8409,7 @@ msgid ""
 " bridges address this by adding another layer of obfuscation."
 msgstr ""
 "Los repetidores puente con "
-"[Obfsproxy](https://github.com/Yawning/obfs4/blob/master/doc/obfs4-spec.txt)"
+"[obfsproxy](https://github.com/Yawning/obfs4/blob/master/doc/obfs4-spec.txt)"
 " resuelven este problema aÃ±adiendo otra capa de ofuscaciÃ³n."
 
 #: https//support.torproject.org/censorship/censorship-7/
@@ -9229,8 +9229,8 @@ msgid ""
 " which connections were relayed and which started at you."
 msgstr ""
 "Hay otros casos donde esto no es una ventaja: si un atacante puede ver todo "
-"tu trÃ¡fico de entrada y de salida, es fÃ¡cil para el distinguir quÃ© "
-"conexiones has iniciado tÃº y cuales vienen desde otro usuario."
+"tu trÃ¡fico de entrada y de salida, le serÃ¡ fÃ¡cil distinguir quÃ© 
conexiones "
+"has iniciado tÃº y cuales vienen desde otro usuario."
 
 #: https//support.torproject.org/relay-operators/better-anonymity/
 #: 
(content/relay-operators/better-anonymity/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/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

2021-10-21 Thread translation

commit c453617c48fee67a71edcbfa67d7de3c92bda96a
Author: Translation commit bot 
Date:   Thu Oct 21 09:16:39 2021 +

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

diff --git a/fa.po b/fa.po
index 72891befe6..f11d9fe2f6 100644
--- a/fa.po
+++ b/fa.po
@@ -9,6 +9,7 @@
 # Ali Mirjamali , 2019
 # Ali, 2015
 # Amir Moezzi , 2017
+# ARA2020, 2021
 # Seyed mohammad ali Hosseinifard , 2019
 # Danial Keshani , 2013
 # Mohammad Hossein , 2014
@@ -37,8 +38,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-09-06 12:01+0200\n"
-"PO-Revision-Date: 2021-09-06 12:26+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-10-21 09:04+\n"
+"Last-Translator: ARA2020\n"
 "Language-Team: Persian 
(http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

___
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-10-21 Thread translation

commit 9086f51c08706c08de7c3bb9310efd2b975f945a
Author: Translation commit bot 
Date:   Thu Oct 21 09:15:51 2021 +

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

diff --git a/fa.po b/fa.po
index 6155dc4778..8abdd8b17a 100644
--- a/fa.po
+++ b/fa.po
@@ -9,6 +9,7 @@
 # Ali Mirjamali , 2019
 # Ali, 2015
 # Amir Moezzi , 2017
+# ARA2020, 2021
 # Seyed mohammad ali Hosseinifard , 2019
 # Danial Keshani , 2013
 # Mohammad Hossein , 2014
@@ -37,8 +38,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-09-06 12:01+0200\n"
-"PO-Revision-Date: 2021-09-06 12:26+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-10-21 09:04+\n"
+"Last-Translator: ARA2020\n"
 "Language-Team: Persian 
(http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -258,7 +259,7 @@ msgstr "ØØ§ÙØ¸Ù Ø±Ù Ú©Ø§ÙÛ Ø±ÙÛ Ø§ÛÙ Ø³ÛØ³ØªÙ Ù
ÙØ¬ÙØ¯ ÙÛØ³Øª"
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:385
 #, perl-brace-format
 msgid "No explanation available for reason '{reason}'."
-msgstr ""
+msgstr "ÙÛÚ ØªÙØ¶ÛØÛ Ø¨Ø±Ø§Û Ø¯ÙÛÙ \"{reason}\" Ø¯Ø± Ø¯Ø³ØªØ±Ø³ 
ÙÛØ³Øª."
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:408
 msgid "The system is up-to-date"

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

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

2021-10-21 Thread translation

commit cd5ce014640df8a7e431212483976eac4dc16aa9
Author: Translation commit bot 
Date:   Thu Oct 21 09:15:12 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+es.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index a5c84710f6..d7a1b9f58c 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -11382,8 +11382,8 @@ msgid ""
 msgstr ""
 "Sentimos que tu cuenta haya sido asaltada por fuerza bruta. Podemos intentar"
 " prevenir que nuestro nodo se conecte a este sitio, pero como la red Tor "
-"tiene cerca de 800 salidas, el hacerlo realmente no detendrÃa esa acciÃ³n en 
"
-"el largo plazo."
+"tiene cerca de 800 salidas, el hacerlo no detendrÃa esa acciÃ³n a largo "
+"plazo."
 
 #: 
https//community.torproject.org/relay/community-resources/tor-abuse-templates/
 #: 
(content/relay/community-resources/tor-abuse-templates/contents+en.lrpage.body)
@@ -12302,10 +12302,10 @@ msgid ""
 "specific legal problems, issues, or questions, seek a complete review of "
 "your situation with a lawyer licensed to practice in your jurisdiction."
 msgstr ""
-"Por lo tanto, por favor no actÃºes solo sobre esta informaciÃ³n; si tienes "
-"cualesquiera problemas legales especÃficos, cuestiones, o preguntas, busca "
-"una completa revisiÃ³n de tu situaciÃ³n con un abogado licenciado para "
-"practicar en tu jurisdicciÃ³n."
+"Por lo tanto, por favor no actÃºes solo con esta informaciÃ³n; si tienes  "
+"problemas legales especÃficos, cuestiones, o preguntas, intenta que un "
+"abogado licenciado para practicar en tu jurisdicciÃ³n mire tu caso en su "
+"conjunto."
 
 #: 
https//community.torproject.org/relay/community-resources/tor-exit-guidelines/
 #: 
(content/relay/community-resources/tor-exit-guidelines/contents+en.lrpage.body)
@@ -19801,7 +19801,7 @@ msgstr "Como desplegar un puente obfs4 en DragonflyBSD"
 #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/
 #: (content/relay/setup/bridge/dragonflybsd/contents+en.lrpage.body)
 msgid "### 1. Bootstrap `pkg`"
-msgstr "### 1. Secuenciar para arranque a `pkg`"
+msgstr "### 1. Arranca `pkg` por primera vez"
 
 #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/
 #: (content/relay/setup/bridge/dragonflybsd/contents+en.lrpage.body)

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

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

2021-10-21 Thread translation

commit 8b24bd47297e3b362f2e9fc7f0b257a33cf584e5
Author: Translation commit bot 
Date:   Thu Oct 21 07:17:47 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed
---
 contents+pt-BR.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index b685b37a48..f899d0473b 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -23,8 +23,8 @@
 # Gus, 2021
 # Claudio Rogerio Carvalho Filho , 2021
 # nilson t. c., 2021
-# Emma Peel, 2021
 # Gabriel Cardoso, 2021
+# Emma Peel, 2021
 # 
 msgid ""
 msgstr ""
@@ -32,7 +32,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-08 13:14+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Gabriel Cardoso, 2021\n"
+"Last-Translator: Emma Peel, 2021\n"
 "Language-Team: Portuguese (Brazil) 
(https://www.transifex.com/otf/teams/1519/pt_BR/)\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/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web

2021-10-21 Thread translation

commit 683d59d209f2fa020d3e05eedda854f72a35069e
Author: Translation commit bot 
Date:   Thu Oct 21 07:17:43 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
---
 contents+pt-BR.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index 5f180fcdcf..f078c3064d 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -23,8 +23,8 @@
 # Gus, 2021
 # Claudio Rogerio Carvalho Filho , 2021
 # nilson t. c., 2021
-# Emma Peel, 2021
 # Gabriel Cardoso, 2021
+# Emma Peel, 2021
 # 
 msgid ""
 msgstr ""
@@ -32,7 +32,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-08 13:14+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Gabriel Cardoso, 2021\n"
+"Last-Translator: Emma Peel, 2021\n"
 "Language-Team: Portuguese (Brazil) 
(https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1095,8 +1095,8 @@ msgid ""
 "This release includes important [security updates to "
 "Firefox](https://www.mozilla.org/en-US/security/advisories/mfsa2020-43/)."
 msgstr ""
-"Esta versÃ£o inclui importantes [atualizaÃ§Ãµes de seguranÃ§a para o Firefox] 
"
-"(https://www.mozilla.org/en-US/security/advisories/mfsa2020-43/)."
+"Esta versÃ£o inclui importantes [atualizaÃ§Ãµes de seguranÃ§a para o "
+"Firefox](https://www.mozilla.org/en-US/security/advisories/mfsa2020-43/)."
 
 #: https//www.torproject.org/releases/tor-browser-10-0/
 #: (content/releases/tor-browser-10-0/contents+en.lrpage.body)

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

98 matches

Mail list logo