date:20210318

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

2021-03-18 Thread translation

commit 36ff4762ed22939ad333cba7eaddbe188015f267
Author: Translation commit bot 
Date:   Fri Mar 19 05:17:41 2021 +

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

diff --git a/contents+my.po b/contents+my.po
index 4f13435c3e..de51443733 100644
--- a/contents+my.po
+++ b/contents+my.po
@@ -1,6 +1,7 @@
 # 
 # Translators:
 # Emma Peel, 2021
+# Thet Htut , 2021
 # 
 msgid ""
 msgstr ""
@@ -8,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-03-01 14:59+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Emma Peel, 2021\n"
+"Last-Translator: Thet Htut , 2021\n"
 "Language-Team: Burmese (https://www.transifex.com/otf/teams/1519/my/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -111,7 +112,7 @@ msgstr "á¡áá¯á¶á¸áá¼á¯áááºá¸áááºá
á½á²"
 
 #: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body)
 msgid "Press"
-msgstr ""
+msgstr "áá¬áááºáááºá¸áá»á¬á¸"
 
 #: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body)
 msgid "Support"

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

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

2021-03-18 Thread translation

commit 43ce375c562404bfa911681e241726fa94aecbd3
Author: Translation commit bot 
Date:   Fri Mar 19 04:46:03 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed
---
 da/messages.json| 2 +-
 de/messages.json| 2 +-
 en/messages.json| 2 +-
 es_AR/messages.json | 2 +-
 es_ES/messages.json | 2 +-
 fr/messages.json| 2 +-
 he/messages.json| 2 +-
 messages.json   | 2 +-
 pt_PT/messages.json | 2 +-
 sv_SE/messages.json | 2 +-
 tr/messages.json| 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/da/messages.json b/da/messages.json
index 7d4966dccb..c45ae2d0dd 100644
--- a/da/messages.json
+++ b/da/messages.json
@@ -36,7 +36,7 @@
 "message": "Cookies er ikke aktiveret."
   },
   "websiteIntro": {
-"message": "Snowflake is a system to defeat internet censorship. People 
who are censored can use Snowflake to access the internet. Their connection 
goes through Snowflake proxies, which are run by volunteers. For more detailed 
information about how Snowflake works see our https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\;>documentation
 wiki."
+"message": "Snowflake is a system to defeat internet censorship. People 
who are censored can use Snowflake to access the internet. Their connection 
goes through Snowflake proxies, which are run by volunteers. For more detailed 
information about how Snowflake works see our https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/wikis/home\;>documentation
 wiki."
   },
   "browser": {
 "message": "Browser"
diff --git a/de/messages.json b/de/messages.json
index d624661494..6d98b20c19 100644
--- a/de/messages.json
+++ b/de/messages.json
@@ -36,7 +36,7 @@
 "message": "Cookies sind nicht aktiviert."
   },
   "websiteIntro": {
-"message": "Snowflake is a system to defeat internet censorship. People 
who are censored can use Snowflake to access the internet. Their connection 
goes through Snowflake proxies, which are run by volunteers. For more detailed 
information about how Snowflake works see our https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\;>documentation
 wiki."
+"message": "Snowflake is a system to defeat internet censorship. People 
who are censored can use Snowflake to access the internet. Their connection 
goes through Snowflake proxies, which are run by volunteers. For more detailed 
information about how Snowflake works see our https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/wikis/home\;>documentation
 wiki."
   },
   "browser": {
 "message": "Browser"
diff --git a/en/messages.json b/en/messages.json
index 0a8925ed8a..15166928a4 100644
--- a/en/messages.json
+++ b/en/messages.json
@@ -36,7 +36,7 @@
 "message": "Cookies are not enabled."
   },
   "websiteIntro": {
-"message": "Snowflake is a system to defeat internet censorship. People 
who are censored can use Snowflake to access the internet. Their connection 
goes through Snowflake proxies, which are run by volunteers. For more detailed 
information about how Snowflake works see our https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\;>documentation
 wiki."
+"message": "Snowflake is a system to defeat internet censorship. People 
who are censored can use Snowflake to access the internet. Their connection 
goes through Snowflake proxies, which are run by volunteers. For more detailed 
information about how Snowflake works see our https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/wikis/home\;>documentation
 wiki."
   },
   "browser": {
 "message": "Browser"
diff --git a/es_AR/messages.json b/es_AR/messages.json
index be21eef3b7..236b8e0b2b 100644
--- a/es_AR/messages.json
+++ b/es_AR/messages.json
@@ -36,7 +36,7 @@
 "message": "Las cookies no estÃ¡n habilitadas."
   },
   "websiteIntro": {
-"message": "Snowflake es un sistema para derrotar a la censura de 
Internet. La gente que es censurada puede usar Snowflake para acceder a 
Internet. Su conexiÃ³n pasa por proxys Snowflake, que estÃ¡n a cargo de 
voluntarios. Para obtener informaciÃ³n mÃ¡s detallada sobre cÃ³mo funciona 
Snowflake, mirÃ¡ nuestra https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\;>documentaciÃ³n
 wiki."
+"message": "Snowflake is a system to defeat internet censorship. People 
who are censored can use Snowflake to access the internet. Their connection 
goes through Snowflake proxies, which are run by volunteers. For more detailed 
information about how Snowflake works see our https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/wikis/home\;>documentation
 wiki."
   },
   "browser": {
 "message": "Navegador"
diff --git a/es_ES/messages.json b/es_ES/messages.json
index f673777bf7..4c0c3e14d9 100644
--- a/es_ES/messages.json
+++ b/es_ES/messages.json
@@ -36,7 +36,7 @@
 "message": "Las cookies no estÃ¡n habilitadas."

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

2021-03-18 Thread translation

commit 4fb3228ad8c1c4f8b7dbe5080c21686497610cbe
Author: Translation commit bot 
Date:   Fri Mar 19 04:45:58 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
---
 ar/messages.json| 2 +-
 bn_BD/messages.json | 2 +-
 ca/messages.json| 2 +-
 cs/messages.json| 2 +-
 da/messages.json| 2 +-
 de/messages.json| 2 +-
 el/messages.json| 2 +-
 en/messages.json| 2 +-
 en_GB/messages.json | 2 +-
 es_AR/messages.json | 2 +-
 es_ES/messages.json | 2 +-
 fa/messages.json| 2 +-
 fi/messages.json| 2 +-
 fr/messages.json| 2 +-
 ga_IE/messages.json | 2 +-
 gl/messages.json| 2 +-
 he/messages.json| 2 +-
 hr/messages.json| 2 +-
 hu/messages.json| 2 +-
 hy_AM/messages.json | 2 +-
 id/messages.json| 2 +-
 is/messages.json| 2 +-
 it/messages.json| 2 +-
 ja/messages.json| 2 +-
 ka/messages.json| 4 ++--
 kk/messages.json| 2 +-
 ko/messages.json| 2 +-
 lt/messages.json| 2 +-
 messages.json   | 2 +-
 mk/messages.json| 2 +-
 ml/messages.json| 2 +-
 mr/messages.json| 2 +-
 nb_NO/messages.json | 2 +-
 nl/messages.json| 2 +-
 pl/messages.json| 2 +-
 pt_BR/messages.json | 2 +-
 pt_PT/messages.json | 2 +-
 ro/messages.json| 2 +-
 ru/messages.json| 2 +-
 sk/messages.json| 2 +-
 sq/messages.json| 2 +-
 sv_SE/messages.json | 2 +-
 sw/messages.json| 2 +-
 ta/messages.json| 2 +-
 th/messages.json| 2 +-
 tr/messages.json| 2 +-
 uk/messages.json| 2 +-
 zh_CN/messages.json | 2 +-
 zh_TW/messages.json | 2 +-
 49 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/ar/messages.json b/ar/messages.json
index 55e8efdc9f..c4cab4790b 100644
--- a/ar/messages.json
+++ b/ar/messages.json
@@ -36,7 +36,7 @@
 "message": "ÙÙÙØ§Øª ØªØ¹Ø±ÙÙ Ø§ÙØ§Ø±ØªØ¨Ø§Ø· (ÙÙÙÙØ²) ØºÙØ± Ù
ÙØ¹ÙØ©."
   },
   "websiteIntro": {
-"message": "Snowflake ÙÙ ÙØ¸Ø§Ù ÙÙØ²ÙÙØ© Ø§ÙØ±ÙØ§Ø¨Ø© Ø¹ÙÙ 
Ø§ÙØ¥ÙØªØ±ÙØª. ÙÙÙÙ ÙÙØ£Ø´Ø®Ø§Øµ Ø§ÙØ®Ø§Ø¶Ø¹ÙÙ ÙÙØ±ÙØ§Ø¨Ø© 
Ø§Ø³ØªØ®Ø¯Ø§Ù Snowflake ÙÙÙØµÙÙ Ø¥ÙÙ Ø§ÙØ¥ÙØªØ±ÙØª. ÙÙØ± 
Ø§ØªØµØ§ÙÙÙ Ø¹Ø¨Ø± ÙÙÙØ§Ø¡ Snowflake Ø ÙØ§ÙØªÙ ÙØ¯ÙØ±ÙØ§ Ù
ØªØ·ÙØ¹ÙÙ. ÙÙØ²ÙØ¯ ÙÙ Ø§ÙÙØ¹ÙÙÙØ§Øª Ø§ÙØªÙØµÙÙÙØ© ØÙÙ 
ÙÙÙÙØ© Ø¹ÙÙ Snowflake Ø Ø±Ø§Ø¬Ø¹ https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\;> ÙÙÙÙ 
Ø§ÙØªÙØ«ÙÙ  Ø§ÙØ®Ø§Øµ Ø¨ÙØ§."
+"message": "Snowflake is a system to defeat internet censorship. People 
who are censored can use Snowflake to access the internet. Their connection 
goes through Snowflake proxies, which are run by volunteers. For more detailed 
information about how Snowflake works see our https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/wikis/home\;>documentation
 wiki."
   },
   "browser": {
 "message": "Ø§ÙÙØªØµÙØ"
diff --git a/bn_BD/messages.json b/bn_BD/messages.json
index 7572dc7442..ba0580507a 100644
--- a/bn_BD/messages.json
+++ b/bn_BD/messages.json
@@ -36,7 +36,7 @@
 "message": "à¦à§à¦à¦¿à¦ à¦¸à¦à§à¦°à¦¿à§ à¦¨à¦¯à¦¼à¥¤"
   },
   "websiteIntro": {
-"message": "Snowflake is a system to defeat internet censorship. People 
who are censored can use Snowflake to access the internet. Their connection 
goes through Snowflake proxies, which are run by volunteers. For more detailed 
information about how Snowflake works see our https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\;>documentation
 wiki."
+"message": "Snowflake is a system to defeat internet censorship. People 
who are censored can use Snowflake to access the internet. Their connection 
goes through Snowflake proxies, which are run by volunteers. For more detailed 
information about how Snowflake works see our https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/wikis/home\;>documentation
 wiki."
   },
   "browser": {
 "message": "à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦°"
diff --git a/ca/messages.json b/ca/messages.json
index 14376d9a43..22b751c693 100644
--- a/ca/messages.json
+++ b/ca/messages.json
@@ -36,7 +36,7 @@
 "message": "Les galetes no estan activades."
   },
   "websiteIntro": {
-"message": "Snowflake is a system to defeat internet censorship. People 
who are censored can use Snowflake to access the internet. Their connection 
goes through Snowflake proxies, which are run by volunteers. For more detailed 
information about how Snowflake works see our https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\;>documentation
 wiki."
+"message": "Snowflake is a system to defeat internet censorship. People 
who are censored can use Snowflake to access the internet. Their connection 
goes through Snowflake proxies, which are run by volunteers. For more detailed 
information about how Snowflake works see our https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/wikis/home\;>documentation
 wiki."
   },
   "browser": {
 "message":

[tor-commits] [snowflake/master] Update webrtc library to v3.0.15

2021-03-18 Thread cohosh

commit 087a037f82d7088c253936f5450c933867b10b2d
Author: Cecylia Bocovich 
Date:   Thu Mar 18 23:08:05 2021 -0400

Update webrtc library to v3.0.15

This fixes a vulnerability in the library: CVE-2021-28681
---
 go.mod | 13 -
 go.sum | 56 
 2 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/go.mod b/go.mod
index a7f9ad2..844f523 100644
--- a/go.mod
+++ b/go.mod
@@ -4,14 +4,17 @@ go 1.13
 
 require (
git.torproject.org/pluggable-transports/goptlib.git v1.1.0
+   github.com/google/uuid v1.2.0 // indirect
github.com/gorilla/websocket v1.4.1
-   github.com/pion/ice/v2 v2.0.14
-   github.com/pion/sdp/v3 v3.0.3
+   github.com/pion/ice/v2 v2.0.15
+   github.com/pion/sdp/v3 v3.0.4
github.com/pion/stun v0.3.5
-   github.com/pion/webrtc/v3 v3.0.0
+   github.com/pion/transport v0.12.3 // indirect
+   github.com/pion/webrtc/v3 v3.0.15
github.com/smartystreets/goconvey v1.6.4
github.com/xtaci/kcp-go/v5 v5.5.12
github.com/xtaci/smux v1.5.12
-   golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
-   golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7
+   golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670
+   golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4
+   golang.org/x/sys v0.0.0-20210317225723-c4fcb01b228e // indirect
 )
diff --git a/go.sum b/go.sum
index eac95e1..34a8c0e 100644
--- a/go.sum
+++ b/go.sum
@@ -17,8 +17,10 @@ github.com/golang/protobuf v1.4.2/go.mod 
h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/google/go-cmp v0.3.0/go.mod 
h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod 
h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod 
h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
-github.com/google/uuid v1.1.2/go.mod 
h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.1.5 h1:kxhtnfFVi+rYdOALN0B3k9UT86zVJKfBimRaciULW4I=
+github.com/google/uuid v1.1.5/go.mod 
h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
+github.com/google/uuid v1.2.0/go.mod 
h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-077cb4d1 
h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-077cb4d1/go.mod 
h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/websocket v1.4.1 
h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
@@ -47,43 +49,46 @@ github.com/pion/datachannel v1.4.21 
h1:3ZvhNyfmxsAqltQrApLPQMhSFNA+aT87RqyCq4OXm
 github.com/pion/datachannel v1.4.21/go.mod 
h1:oiNyP4gHx2DIwRzX/MFyH0Rz/Gz05OgBlayAI2hAWjg=
 github.com/pion/dtls/v2 v2.0.4 h1:WuUcqi6oYMu/noNTz92QrF1DaFj4eXbhQ6dzaaAwOiI=
 github.com/pion/dtls/v2 v2.0.4/go.mod 
h1:qAkFscX0ZHoI1E07RfYPoRw3manThveu+mlTDdOxoGI=
-github.com/pion/ice/v2 v2.0.14 h1:FxXxauyykf89SWAtkQCfnHkno6G8+bhRkNguSh9zU+4=
-github.com/pion/ice/v2 v2.0.14/go.mod 
h1:wqaUbOq5ObDNU5ox1hRsEst0rWfsKuH1zXjQFEWiZwM=
-github.com/pion/interceptor v0.0.8 
h1:qsVJv9RF7mPq/RUnUV5iZCzxwGizO880FuiFKkEGQaE=
-github.com/pion/interceptor v0.0.8/go.mod 
h1:dHgEP5dtxOTf21MObuBAjJeAayPxLUAZjerGH8Xr07c=
+github.com/pion/dtls/v2 v2.0.8 h1:reGe8rNIMfO/UAeFLqO61tl64t154Qfkr4U3Gzu1tsg=
+github.com/pion/dtls/v2 v2.0.8/go.mod 
h1:QuDII+8FVvk9Dp5t5vYIMTo7hh7uBkra+8QIm7QGm10=
+github.com/pion/ice/v2 v2.0.15 h1:KZrwa2ciL9od8+TUVJiYTNsCW9J5lktBjGwW1MacEnQ=
+github.com/pion/ice/v2 v2.0.15/go.mod 
h1:ZIiVGevpgAxF/cXiIVmuIUtCb3Xs4gCzCbXB6+nFkSI=
+github.com/pion/interceptor v0.0.10 
h1:dXFyFWRJFwmzQqyn0U8dUAbOJu+JJnMVAqxmvTu30B4=
+github.com/pion/interceptor v0.0.10/go.mod 
h1:qzeuWuD/ZXvPqOnxNcnhWfkCZ2e1kwwslicyyPnhoK4=
 github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY=
 github.com/pion/logging v0.2.2/go.mod 
h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms=
 github.com/pion/mdns v0.0.4 h1:O4vvVqr4DGX63vzmO6Fw9vpy3lfztVWHGCQfyw0ZLSY=
 github.com/pion/mdns v0.0.4/go.mod 
h1:R1sL0p50l42S5lJs91oNdUL58nm0QHrhxnSegr++qC0=
 github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA=
 github.com/pion/randutil v0.1.0/go.mod 
h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
-github.com/pion/rtcp v1.2.4/go.mod 
h1:52rMNPWFsjr39z9B9MhnkqhPLoeHTv1aN63o/42bWE0=
 github.com/pion/rtcp v1.2.6 h1:1zvwBbyd0TeEuuWftrd/4d++m+/kZSeiguxU61LFWpo=
 github.com/pion/rtcp v1.2.6/go.mod 
h1:52rMNPWFsjr39z9B9MhnkqhPLoeHTv1aN63o/42bWE0=
-github.com/pion/rtp v1.6.1/go.mod 
h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
 github.com/pion/rtp v1.6.2 h1:iGBerLX6JiDjB9NXuaPzHyxHFG9JsIEdgwTC0lp5n/U=
 github.com/pion/rtp v1.6.2/go.mod 
h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
 github.com/pion/sctp v1.7.10/go.mod

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

2021-03-18 Thread sysrqb

commit 551b9a51a0c71868107f7cee1016a199e7486baa
Author: Matthew Finkel 
Date:   Thu Mar 18 23:19:30 2021 +

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

diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton
index ba38a0f51e25..772716932a2d 16
--- a/toolkit/torproject/torbutton
+++ b/toolkit/torproject/torbutton
@@ -1 +1 @@
-Subproject commit ba38a0f51e2556a896feb0baf1fb4fd7f3970c3b
+Subproject commit 772716932a2dd127793b47e91c10691c631b09f4

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

[tor-commits] [snowflake-webext/master] Update link to documentation wiki

2021-03-18 Thread cohosh

commit 9df27c83d6ea87488c470c059d9e7c0728f0b4c4
Author: Cecylia Bocovich 
Date:   Thu Mar 18 22:21:23 2021 -0400

Update link to documentation wiki
---
 static/_locales/en_US/messages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/_locales/en_US/messages.json 
b/static/_locales/en_US/messages.json
index 0a8925e..1516692 100644
--- a/static/_locales/en_US/messages.json
+++ b/static/_locales/en_US/messages.json
@@ -36,7 +36,7 @@
 "message": "Cookies are not enabled."
   },
   "websiteIntro": {
-"message": "Snowflake is a system to defeat internet censorship. People 
who are censored can use Snowflake to access the internet. Their connection 
goes through Snowflake proxies, which are run by volunteers. For more detailed 
information about how Snowflake works see our https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\;>documentation
 wiki."
+"message": "Snowflake is a system to defeat internet censorship. People 
who are censored can use Snowflake to access the internet. Their connection 
goes through Snowflake proxies, which are run by volunteers. For more detailed 
information about how Snowflake works see our https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/wikis/home\;>documentation
 wiki."
   },
   "browser": {
 "message": "Browser"

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

[tor-commits] [snowflake/master] Don't log io.ErrClosedPipe in server

2021-03-18 Thread cohosh

commit 720d2b8eb7be9e2a41126624083054a66017d452
Author: Cecylia Bocovich 
Date:   Mon Mar 8 21:50:42 2021 -0500

Don't log io.ErrClosedPipe in server

These errors are triggered in three places when the OR connection times
out. They don't tell us anything useful and are filling up our logs.
---
 server/server.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/server.go b/server/server.go
index 3b263d0..b3fa04a 100644
--- a/server/server.go
+++ b/server/server.go
@@ -73,7 +73,7 @@ func proxy(local *net.TCPConn, conn net.Conn) {
wg.Add(2)
 
go func() {
-   if _, err := io.Copy(conn, local); err != nil {
+   if _, err := io.Copy(conn, local); err != nil && err != 
io.ErrClosedPipe {
log.Printf("error copying ORPort to WebSocket %v", err)
}
if err := local.CloseRead(); err != nil {
@@ -83,7 +83,7 @@ func proxy(local *net.TCPConn, conn net.Conn) {
wg.Done()
}()
go func() {
-   if _, err := io.Copy(local, conn); err != nil {
+   if _, err := io.Copy(local, conn); err != nil && err != 
io.ErrClosedPipe {
log.Printf("error copying WebSocket to ORPort %v", err)
}
if err := local.CloseWrite(); err != nil {
@@ -352,7 +352,7 @@ func acceptSessions(ln *kcp.Listener) error {
go func() {
defer conn.Close()
err := acceptStreams(conn)
-   if err != nil {
+   if err != nil && err != io.ErrClosedPipe {
log.Printf("acceptStreams: %v", err)
}
}()



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

[tor-commits] [snowflake/master] Don't log errors from callng close on OR conns

2021-03-18 Thread cohosh

commit c0b6e082f2f30cbeca962937ea5a777b98cf3ebb
Author: Cecylia Bocovich 
Date:   Mon Mar 8 22:16:33 2021 -0500

Don't log errors from callng close on OR conns

Snowflake copies data between the OR connection and the KCP stream,
meaning that in most cases the copy loops will only terminate once the
OR connection times out. In this case the OR connection is already
closed and so calls to CloseRead and CloseWrite will generate errors.
---
 server/server.go | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/server/server.go b/server/server.go
index b3fa04a..620cd50 100644
--- a/server/server.go
+++ b/server/server.go
@@ -76,9 +76,7 @@ func proxy(local *net.TCPConn, conn net.Conn) {
if _, err := io.Copy(conn, local); err != nil && err != 
io.ErrClosedPipe {
log.Printf("error copying ORPort to WebSocket %v", err)
}
-   if err := local.CloseRead(); err != nil {
-   log.Printf("error closing read after copying ORPort to 
WebSocket %v", err)
-   }
+   local.CloseRead()
conn.Close()
wg.Done()
}()
@@ -86,9 +84,7 @@ func proxy(local *net.TCPConn, conn net.Conn) {
if _, err := io.Copy(local, conn); err != nil && err != 
io.ErrClosedPipe {
log.Printf("error copying WebSocket to ORPort %v", err)
}
-   if err := local.CloseWrite(); err != nil {
-   log.Printf("error closing write after copying WebSocket 
to ORPort %v", err)
-   }
+   local.CloseWrite()
conn.Close()
wg.Done()
}()

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

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

2021-03-18 Thread translation

commit 1c57dcc2653aa6946bc0ffa8b11e9f75c26656de
Author: Translation commit bot 
Date:   Fri Mar 19 00:47:31 2021 +

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

diff --git a/contents+es.po b/contents+es.po
index ccec2c9997..3fc15511d1 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -1630,6 +1630,9 @@ msgid ""
 "Another way to learn about an onion site is if the website administrator has"
 " implemented a feature called Onion-Location."
 msgstr ""
+"Otra forma de obtener informaciÃ³n sobre un sitio onion es si el "
+"administrador del sitio web ha implementado una funciÃ³n llamada Onion-"
+"Location."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1666,6 +1669,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1693,7 +1698,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid "## ONION SERVICE AUTHENTICATION"
-msgstr ""
+msgstr "## AUTENTICACIÃN DEL SERVICIO CEBOLLA"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1701,6 +1706,9 @@ msgid ""
 "An authenticated onion service is a service like an onion site that requires"
 " the client to provide an authentication token before accessing the service."
 msgstr ""
+"Un servicio cebolla autenticado es un servicio como un sitio onion que "
+"requiere que el cliente proporcione una credencial de autenticaciÃ³n antes de"
+" acceder al servicio."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1714,6 +1722,8 @@ msgid ""
 "In order to access this service, you will need access credentials from the "
 "onion service operator."
 msgstr ""
+"Para poder acceder a este servicio, necesitarÃ¡s las credenciales de acceso "
+"del operador del servicio cebolla."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1742,7 +1752,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid "### ONION SERVICES ERRORS"
-msgstr ""
+msgstr "### ERRORES DEL SERVICIO CEBOLLA"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)

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

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

2021-03-18 Thread translation

commit f05abf6c8750445a58dfcdbc7c99f09fad09c55a
Author: Translation commit bot 
Date:   Fri Mar 19 00:45:47 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed
---
 ar/aboutTor.dtd| 4 
 ca/aboutTor.dtd| 4 
 cs/aboutTor.dtd| 4 
 da/aboutTor.dtd| 4 
 de/aboutTor.dtd| 4 
 el/aboutTor.dtd| 4 
 en-GB/aboutTor.dtd | 4 
 en-US/aboutTor.dtd | 4 
 en/aboutTor.dtd| 4 
 es-AR/aboutTor.dtd | 4 
 es-ES/aboutTor.dtd | 4 
 fa/aboutTor.dtd| 4 
 fi/aboutTor.dtd| 4 
 fr/aboutTor.dtd| 4 
 ga-IE/aboutTor.dtd | 4 
 he/aboutTor.dtd| 4 
 hi-IN/aboutTor.dtd | 4 
 hr/aboutTor.dtd| 4 
 hu/aboutTor.dtd| 4 
 id/aboutTor.dtd| 4 
 is/aboutTor.dtd| 4 
 it/aboutTor.dtd| 4 
 ja/aboutTor.dtd| 4 
 ka/aboutTor.dtd| 4 
 ko/aboutTor.dtd| 4 
 lt/aboutTor.dtd| 4 
 mk/aboutTor.dtd| 4 
 ms/aboutTor.dtd| 4 
 nl/aboutTor.dtd| 4 
 pl/aboutTor.dtd| 4 
 pt-BR/aboutTor.dtd | 4 
 pt-PT/aboutTor.dtd | 4 
 ro/aboutTor.dtd| 4 
 ru/aboutTor.dtd| 4 
 sv-SE/aboutTor.dtd | 4 
 tr/aboutTor.dtd| 4 
 uk/aboutTor.dtd| 4 
 vi/aboutTor.dtd| 4 
 zh-CN/aboutTor.dtd | 4 
 zh-TW/aboutTor.dtd | 4 
 40 files changed, 160 deletions(-)

diff --git a/ar/aboutTor.dtd b/ar/aboutTor.dtd
index b85fb130c3..70d6b86e99 100644
--- a/ar/aboutTor.dtd
+++ b/ar/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/ca/aboutTor.dtd b/ca/aboutTor.dtd
index 3d5966fc49..0741dd0011 100644
--- a/ca/aboutTor.dtd
+++ b/ca/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/cs/aboutTor.dtd b/cs/aboutTor.dtd
index 40385f6bfe..a86c4c0295 100644
--- a/cs/aboutTor.dtd
+++ b/cs/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/da/aboutTor.dtd b/da/aboutTor.dtd
index b711317500..09c87f8c0f 100644
--- a/da/aboutTor.dtd
+++ b/da/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/de/aboutTor.dtd b/de/aboutTor.dtd
index 708393caa6..1e87c70d12 100644
--- a/de/aboutTor.dtd
+++ b/de/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/el/aboutTor.dtd b/el/aboutTor.dtd
index 9ffa145ef7..8b41bbce3b 100644
--- a/el/aboutTor.dtd
+++ b/el/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/en-GB/aboutTor.dtd b/en-GB/aboutTor.dtd
index 9ffa145ef7..8b41bbce3b 100644
--- a/en-GB/aboutTor.dtd
+++ b/en-GB/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/en-US/aboutTor.dtd b/en-US/aboutTor.dtd
index 9ffa145ef7..8b41bbce3b 100644
--- a/en-US/aboutTor.dtd
+++ b/en-US/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/en/aboutTor.dtd b/en/aboutTor.dtd
index 9ffa145ef7..8b41bbce3b 100644
--- a/en/aboutTor.dtd
+++ b/en/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/es-AR/aboutTor.dtd b/es-AR/aboutTor.dtd
index ce843db075..0c4ebb648a 100644
--- a/es-AR/aboutTor.dtd
+++ b/es-AR/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/es-ES/aboutTor.dtd b/es-ES/aboutTor.dtd
index 04c2b2bb01..3909b8f432 100644
--- a/es-ES/aboutTor.dtd
+++ b/es-ES/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/fa/aboutTor.dtd b/fa/aboutTor.dtd
index e1e7257b8b..44e1efbcb8 100644
--- a/fa/aboutTor.dtd
+++ b/fa/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/fi/aboutTor.dtd b/fi/aboutTor.dtd
index e819eb9ea3..e493f33261 100644
--- a/fi/aboutTor.dtd
+++ b/fi/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/fr/aboutTor.dtd b/fr/aboutTor.dtd
index 94ad9e032b..c3dab6db0f 100644
--- a/fr/aboutTor.dtd
+++ b/fr/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/ga-IE/aboutTor.dtd b/ga-IE/aboutTor.dtd
index d9d9a5cf15..8f03245ab3 100644
--- a/ga-IE/aboutTor.dtd
+++ b/ga-IE/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/he/aboutTor.dtd b/he/aboutTor.dtd
index 4b1bd3e1b9..520d773beb 100644
--- a/he/aboutTor.dtd
+++ b/he/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/hi-IN/aboutTor.dtd b/hi-IN/aboutTor.dtd
index 9ffa145ef7..8b41bbce3b 100644
--- a/hi-IN/aboutTor.dtd
+++ b/hi-IN/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/hr/aboutTor.dtd b/hr/aboutTor.dtd
index 89d2aca9a0..6590550e0e 100644
--- a/hr/aboutTor.dtd
+++ b/hr/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/hu/aboutTor.dtd b/hu/aboutTor.dtd
index 9868c50417..0ea0259939 100644
--- a/hu/aboutTor.dtd
+++ b/hu/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/id/aboutTor.dtd b/id/aboutTor.dtd
index df42da6404..be1ecb0721 100644
--- a/id/aboutTor.dtd
+++ b/id/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/is/aboutTor.dtd b/is/aboutTor.dtd
index 0ee39b01fb..8b41bbce3b 100644
--- a/is/aboutTor.dtd
+++ b/is/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/it/aboutTor.dtd b/it/aboutTor.dtd
index 65fb7f496f..34fe800631 100644
--- a/it/aboutTor.dtd
+++ b/it/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git

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

2021-03-18 Thread translation

commit 4fc0287b4c166dcfad761a0be2b7af097dfc04d0
Author: Translation commit bot 
Date:   Fri Mar 19 00:45:26 2021 +

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

diff --git a/af/aboutTor.dtd b/af/aboutTor.dtd
index aa5bd5f5bb..c066c194e4 100644
--- a/af/aboutTor.dtd
+++ b/af/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/ar/aboutTor.dtd b/ar/aboutTor.dtd
index ba01471e93..00f2f913db 100644
--- a/ar/aboutTor.dtd
+++ b/ar/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/az/aboutTor.dtd b/az/aboutTor.dtd
index 79ff516347..c1a510f902 100644
--- a/az/aboutTor.dtd
+++ b/az/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/bg/aboutTor.dtd b/bg/aboutTor.dtd
index b486b47103..75bb7338a0 100644
--- a/bg/aboutTor.dtd
+++ b/bg/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/bn-BD/aboutTor.dtd b/bn-BD/aboutTor.dtd
index 35fed0f0d1..a089acb9c6 100644
--- a/bn-BD/aboutTor.dtd
+++ b/bn-BD/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/ca/aboutTor.dtd b/ca/aboutTor.dtd
index 3d5966fc49..0741dd0011 100644
--- a/ca/aboutTor.dtd
+++ b/ca/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/cs/aboutTor.dtd b/cs/aboutTor.dtd
index 43b8f5f90e..4a2a2e2b10 100644
--- a/cs/aboutTor.dtd
+++ b/cs/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/cy/aboutTor.dtd b/cy/aboutTor.dtd
index 6488fca36a..f9597a2147 100644
--- a/cy/aboutTor.dtd
+++ b/cy/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/da/aboutTor.dtd b/da/aboutTor.dtd
index b711317500..09c87f8c0f 100644
--- a/da/aboutTor.dtd
+++ b/da/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/de/aboutTor.dtd b/de/aboutTor.dtd
index 8e82ac2f7f..65f3834aef 100644
--- a/de/aboutTor.dtd
+++ b/de/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/el/aboutTor.dtd b/el/aboutTor.dtd
index 400bb4cc78..8d17ba1250 100644
--- a/el/aboutTor.dtd
+++ b/el/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/en-GB/aboutTor.dtd b/en-GB/aboutTor.dtd
index e4ddafc8c2..4367343769 100644
--- a/en-GB/aboutTor.dtd
+++ b/en-GB/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/en-US/aboutTor.dtd b/en-US/aboutTor.dtd
index 13e2d8a2ae..7b231095aa 100644
--- a/en-US/aboutTor.dtd
+++ b/en-US/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/en/aboutTor.dtd b/en/aboutTor.dtd
index 13e2d8a2ae..7b231095aa 100644
--- a/en/aboutTor.dtd
+++ b/en/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/eo/aboutTor.dtd b/eo/aboutTor.dtd
index bd890a2c42..5bd4b5e08c 100644
--- a/eo/aboutTor.dtd
+++ b/eo/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/es-AR/aboutTor.dtd b/es-AR/aboutTor.dtd
index ce843db075..0c4ebb648a 100644
--- a/es-AR/aboutTor.dtd
+++ b/es-AR/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-
diff --git a/es-ES/aboutTor.dtd b/es-ES/aboutTor.dtd
index 04c2b2bb01..3909b8f432 100644
---

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

2021-03-18 Thread translation

commit c675ebc1daf59cd9c1444c4c367a5bc24b4893c2
Author: Translation commit bot 
Date:   Fri Mar 19 00:16:50 2021 +

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

diff --git a/contents+es.po b/contents+es.po
index f2f214cb69..ccec2c9997 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -1611,6 +1611,9 @@ msgid ""
 "in the URL bar an icon of an onion displaying the state of your connection: "
 "secure and using an onion service."
 msgstr ""
+"Al acceder a un sitio web que utiliza un servicio cebolla, el Navegador Tor "
+"mostrarÃ¡ en la barra de URL un icono de una cebolla que muestra el estado de"
+" tu conexiÃ³n: segura y usando un servicio cebolla."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1618,6 +1621,8 @@ msgid ""
 "You can learn more about the onion site that you are visiting by looking at "
 "the Circuit Display."
 msgstr ""
+"Puedes obtener mÃ¡s informaciÃ³n sobre el sitio onion que estÃ¡ visitando en 
la"
+" pantalla del circuito."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)

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

[tor-commits] [tor-browser-build/master] Release preparations for 10.5a12

2021-03-18 Thread sysrqb

commit e32e80bf9c69d6bcd4ed2b06e4181463433fba59
Author: Matthew Finkel 
Date:   Thu Mar 18 18:26:19 2021 +

Release preparations for 10.5a12

Versions bump and Changelog update
---
 projects/go/config |   4 +-
 projects/tba-translation/config|   2 +-
 .../tor-browser/Bundle-Data/Docs/ChangeLog.txt |  19 ++
 projects/tor-browser/allowed_addons.json   | 285 +++--
 projects/tor-browser/config|   4 +-
 projects/tor/config|   2 +-
 rbm.conf   |   4 +-
 7 files changed, 175 insertions(+), 145 deletions(-)

diff --git a/projects/go/config b/projects/go/config
index b6aaccb..fd37873 100644
--- a/projects/go/config
+++ b/projects/go/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 1.15.7
+version: 1.15.10
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 
 var:
@@ -118,7 +118,7 @@ input_files:
 enable: '[% ! c("var/linux") %]'
   - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz'
 name: go
-sha256sum: 8631b3aafd8ecb9244ec2ffb8a2a8b4983cf4ad15572b9801f7c5b167c1a2abc
+sha256sum: c1dbca6e0910b41d61a95bf9878f6d6e93d15d884c226b91d9d4b1113c10dd65
   - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz'
 name: go14
 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959
diff --git a/projects/tba-translation/config b/projects/tba-translation/config
index 867b0c8..76c8d3f 100644
--- a/projects/tba-translation/config
+++ b/projects/tba-translation/config
@@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% 
c("var/build_id") %].tar.gz'
 git_url: https://git.torproject.org/translation.git
 # We need to bump the commit before releasing but just pointing to a branch
 # might cause too much rebuidling of the Firefox part.
-git_hash: 78436bf799015834e57faccd936f50e3718815be
+git_hash: 75a88b97c88d73d0d94a962a75703f0c33f8087c
 version: '[% c("abbrev") %]'
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt 
b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 2aba710..09da658 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,22 @@
+Tor Browser 10.5a12 -- March 20 2021
+ * Android
+   * Update Fenix to 87.0.0-beta.2
+   * Update NoScript to 11.2.3
+   * Update Tor to 0.4.6.1-alpha
+   * Translations update
+   * Bug 40030: DuckDuckGo redirect to html doesn't work [torbutton]
+   * Bug 40043: Rebase android-components patches for Fenix 87 beta 2 builds 
[android-components]
+   * Bug 40045: Add External App Prompt for Sharing Images [android-components]
+   * Bug 40150: Rebase Fenix patches to Fenix 87 beta 2 [fenix]
+   * Bug 40361: Rebase tor-browser patches to 87.0b4 [tor-browser]
+ * Build System
+   * Android
+ * Update Go to 1.15.10
+ * Bug 23631: Use rootless containers [tor-browser-build]
+ * Bug 40016: getfpaths is not setting origin_project [rbm]
+ * Bug 40172: Move Gradle compilers out of android-toolchain to own gradle 
project [tor-browser-build]
+ * Bug 40241: Update components for mozilla87-based Fenix 
[tor-browser-build]
+
 Tor Browser 10.0.13 -- March 3 2021
  * Linux
* Bug 40328: Fix instability after upgrading to glibc 2.33
diff --git a/projects/tor-browser/allowed_addons.json 
b/projects/tor-browser/allowed_addons.json
index 5f6b16f..448ad35 100644
--- a/projects/tor-browser/allowed_addons.json
+++ b/projects/tor-browser/allowed_addons.json
@@ -12,12 +12,12 @@
   {
 "id": 13299734,
 "name": "Alexander Shutau",
-"url": "https://addons.mozilla.org/en-US/android/user/13299734/;,
+"url": "https://addons.mozilla.org/en-US/firefox/user/13299734/;,
 "username": "alexanderby",
 "picture_url": 
"https://addons.cdn.mozilla.net/user-media/userpics/13/13299/13299734.png?modified=1565722641;
   }
 ],
-"average_daily_users": 597458,
+"average_daily_users": 627861,
 "categories": {
   "android": [
 "experimental",
@@ -31,7 +31,7 @@
 "contributions_url": 
"https://opencollective.com/darkreader?utm_content=product-page-contribute_medium=referral_source=addons.mozilla.org;,
 "created": "2017-09-19T07:03:00Z",
 "current_version": {
-  "id": 5168569,
+  "id": 5186492,
   "compatibility": {
 "firefox": {
   "min": "54.0",
@@ -42,19 +42,19 @@
   "max": "*"
 }
   },
-  "edit_url": 
"https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/5168569;,
+  "edit_url": 
"https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/5186492;,
   "files": [
 {
-  "id": 3712931,
-

[tor-commits] [torbutton/master] Translations update

2021-03-18 Thread sysrqb

commit 772716932a2dd127793b47e91c10691c631b09f4
Author: Matthew Finkel 
Date:   Thu Mar 18 23:17:16 2021 +

Translations update
---
 chrome/locale/ar/aboutTor.dtd |  1 -
 chrome/locale/bn-BD/aboutTor.dtd  |  1 -
 chrome/locale/ca/aboutTor.dtd |  1 -
 chrome/locale/cs/aboutTor.dtd |  1 -
 chrome/locale/da/aboutTor.dtd |  1 -
 chrome/locale/de/aboutTor.dtd |  1 -
 chrome/locale/el/aboutTor.dtd |  1 -
 chrome/locale/es-AR/aboutTor.dtd  |  3 +--
 chrome/locale/es-ES/aboutDialog.dtd   |  2 +-
 chrome/locale/es-ES/aboutTor.dtd  |  1 -
 chrome/locale/eu/aboutTor.dtd |  1 -
 chrome/locale/fa/aboutTor.dtd |  1 -
 chrome/locale/fr/aboutDialog.dtd  |  2 +-
 chrome/locale/fr/aboutTor.dtd |  3 +--
 chrome/locale/fr/torbutton.properties |  2 +-
 chrome/locale/ga-IE/aboutTor.dtd  |  1 -
 chrome/locale/he/aboutTor.dtd |  3 +--
 chrome/locale/he/brand.dtd|  4 ++--
 chrome/locale/he/browserOnboarding.properties |  2 +-
 chrome/locale/he/torbutton.dtd|  2 +-
 chrome/locale/hu/aboutTor.dtd |  1 -
 chrome/locale/id/aboutTor.dtd |  1 -
 chrome/locale/id/torbutton.properties | 30 +++
 chrome/locale/is/aboutTor.dtd |  1 -
 chrome/locale/it/aboutTor.dtd |  1 -
 chrome/locale/ja/aboutTor.dtd |  1 -
 chrome/locale/ja/browserOnboarding.properties | 34 +--
 chrome/locale/ja/torbutton.dtd|  6 ++---
 chrome/locale/ja/torbutton.properties |  4 ++--
 chrome/locale/ka/aboutTor.dtd |  1 -
 chrome/locale/ka/torbutton.properties | 16 ++---
 chrome/locale/ko/aboutTor.dtd |  1 -
 chrome/locale/ko/browserOnboarding.properties |  8 +++
 chrome/locale/ko/torbutton.dtd|  6 ++---
 chrome/locale/ko/torbutton.properties |  4 ++--
 chrome/locale/lt/aboutTor.dtd |  1 -
 chrome/locale/mk/aboutTor.dtd |  1 -
 chrome/locale/ms/aboutTor.dtd |  1 -
 chrome/locale/nb-NO/aboutTor.dtd  |  1 -
 chrome/locale/nl/aboutTor.dtd |  3 +--
 chrome/locale/pl/aboutTor.dtd |  1 -
 chrome/locale/pl/torbutton.properties |  2 +-
 chrome/locale/pt-BR/aboutTor.dtd  |  1 -
 chrome/locale/ro/aboutTor.dtd |  1 -
 chrome/locale/ru/aboutTor.dtd |  1 -
 chrome/locale/sv-SE/aboutTBUpdate.dtd |  2 +-
 chrome/locale/sv-SE/aboutTor.dtd  |  3 +--
 chrome/locale/sv-SE/torbutton.properties  |  2 +-
 chrome/locale/th/aboutTor.dtd |  1 -
 chrome/locale/tr/aboutTor.dtd |  1 -
 chrome/locale/vi/aboutTor.dtd |  1 -
 chrome/locale/zh-CN/aboutTor.dtd  |  1 -
 chrome/locale/zh-TW/aboutTor.dtd  |  1 -
 53 files changed, 69 insertions(+), 105 deletions(-)

diff --git a/chrome/locale/ar/aboutTor.dtd b/chrome/locale/ar/aboutTor.dtd
index 7ed550de..ba01471e 100644
--- a/chrome/locale/ar/aboutTor.dtd
+++ b/chrome/locale/ar/aboutTor.dtd
@@ -33,4 +33,3 @@
 
 
 
-
diff --git a/chrome/locale/bn-BD/aboutTor.dtd b/chrome/locale/bn-BD/aboutTor.dtd
index c714fb0f..35fed0f0 100644
--- a/chrome/locale/bn-BD/aboutTor.dtd
+++ b/chrome/locale/bn-BD/aboutTor.dtd
@@ -33,4 +33,3 @@
 
 
 
-
diff --git a/chrome/locale/ca/aboutTor.dtd b/chrome/locale/ca/aboutTor.dtd
index a9c6d979..3d5966fc 100644
--- a/chrome/locale/ca/aboutTor.dtd
+++ b/chrome/locale/ca/aboutTor.dtd
@@ -33,4 +33,3 @@
 
 
 
-
diff --git a/chrome/locale/cs/aboutTor.dtd b/chrome/locale/cs/aboutTor.dtd
index 26465788..43b8f5f9 100644
--- a/chrome/locale/cs/aboutTor.dtd
+++ b/chrome/locale/cs/aboutTor.dtd
@@ -33,4 +33,3 @@
 
 
 
-
diff --git a/chrome/locale/da/aboutTor.dtd b/chrome/locale/da/aboutTor.dtd
index 5e6a8f6c..b7113175 100644
--- a/chrome/locale/da/aboutTor.dtd
+++ b/chrome/locale/da/aboutTor.dtd
@@ -33,4 +33,3 @@
 
 
 
-
diff --git a/chrome/locale/de/aboutTor.dtd b/chrome/locale/de/aboutTor.dtd
index 0f0ddba0..8e82ac2f 100644
--- a/chrome/locale/de/aboutTor.dtd
+++ b/chrome/locale/de/aboutTor.dtd
@@ -33,4 +33,3 @@
 
 
 
-
diff --git a/chrome/locale/el/aboutTor.dtd b/chrome/locale/el/aboutTor.dtd
index d2c4c412..400bb4cc 100644
--- a/chrome/locale/el/aboutTor.dtd
+++ b/chrome/locale/el/aboutTor.dtd
@@ -33,4 +33,3 @@
 
 
 
-
diff --git a/chrome/locale/es-AR/aboutTor.dtd b/chrome/locale/es-AR/aboutTor.dtd
index 4e96cdcf..ce843db0 100644
--- a/chrome/locale/es-AR/aboutTor.dtd
+++ b/chrome/locale/es-AR/aboutTor.dtd
@@ -31,6 +31,5 @@
 
 
 
-
+
 
-
diff --git a/chrome/locale/es-ES/aboutDialog.dtd 
b/chrome/locale/es-ES/aboutDialog.dtd
index 55a6b368..f119fe49 100644
--- a/chrome/locale/es-ES/aboutDialog.dtd
+++

[tor-commits] [torbutton/master] Revert "Bug 40113: Add strings for EOY 2020 campaign"

2021-03-18 Thread sysrqb

commit 3d0974c3ba26c9ee234ad1da52c5d0c208c5f557
Author: Matthew Finkel 
Date:   Thu Mar 18 23:16:17 2021 +

Revert "Bug 40113: Add strings for EOY 2020 campaign"

This reverts commit d27b2be209e0fd423dedb4e797abc899f6c60bdd.
---
 chrome/locale/en-US/aboutTor.dtd | 4 
 1 file changed, 4 deletions(-)

diff --git a/chrome/locale/en-US/aboutTor.dtd b/chrome/locale/en-US/aboutTor.dtd
index 13e2d8a2..7b231095 100644
--- a/chrome/locale/en-US/aboutTor.dtd
+++ b/chrome/locale/en-US/aboutTor.dtd
@@ -29,7 +29,3 @@
 
 
 
-
-
-
-



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

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

2021-03-18 Thread translation

commit df0103a9cf91224cdfcfb903b3b799a1bcad331f
Author: Translation commit bot 
Date:   Thu Mar 18 20:17:02 2021 +

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

diff --git a/contents+ka.po b/contents+ka.po
index ba3fad2e68..502d6546fd 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -3735,6 +3735,11 @@ msgid ""
 "browsers, and Orfox was crucial for helping people circumvent censorship and"
 " access blocked sites and critical resources."
 msgstr ""
+"áááááááá á¡áá á¬áááá¬ááá¨á, Orfox 
áá£áááááá ááááá áááááá áá 
ááá®áá áááá áªááááá£áá "
+"á¡áá¨á£ááááá, ááá¢áá ááá¢áá¡ 
ááá¡áááá®á£áááááá ááá ááá£ááááá¡ 
áááªááá, á©ááá£áááá áá "
+"áá áá£ááá ááááá á¨áááá áááá, 
áááá¡ááá Orfox áá§á áááááá¬á§ááá¢á áá 
á®ááá®áá¡áááá¡, ááá¡ááª "
+"áá¡áááá áááááá áªáááá£á áá¡áááá¡ 
áááá ááá¡ áááá, ááá á«ááá£á 
á¡ááá¢ááááá áá ááá¡ááááááá "
+"á¬áááááá¡áááá¡."
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
@@ -3743,6 +3748,8 @@ msgid ""
 "tor-browser-android) after the official Tor Browser for Android was "
 "released."
 msgstr ""
+"2019 á¬ááá¡, [Orfox áááá®á£á 
á](https://blog.torproject.org/orfox-paved-way-tor-;
+"browser-android), ááá¡ á¨ááááá á ááª 
áááááááá áá¤ááªáááá£á á Tor-áá 
áá£ááá á."
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
@@ -3760,7 +3767,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
 msgid "Orbot uses Tor to encrypt your Internet traffic."
-msgstr ""
+msgstr "Orbot áá§ááááá¡ Tor-á¡ ááá¢áá 
ááá¢áááá¨áá áá¡ ááá¡áá¨áá¤á áá."
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
@@ -3768,6 +3775,8 @@ msgid ""
 "Then you can use it with other apps installed on your mobile device to "
 "circumvent censorship and protect against surveillance."
 msgstr ""
+"ááá¡á ááá¨áááááá, á¨áááá«áááá 
áááááá£á á¨á ááá§ááááá£áá á¡á®áá áá 
ááá áááááá, áááá "
+"ááá áááá áªáááá£á áá¡ áá áááá 
ááááªááá ááá§á£á áááááá¡ááá."
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
@@ -3851,6 +3860,10 @@ msgid ""
 "Phones but in case of the newer Microsoft-branded/promoted phones, same "
 "steps on [Tor Browser on Android](#tor-browser-for-android) can be followed."
 msgstr ""
+"ááááááá, áá  áá á¡ááááá¡ á ááá 
áá®áá ááááá ááá ááá Tor-áá¡ á«ááá 
Windows-á¢áááá¤áááááá "
+"ááá¡áá¨ááááá, áá£ááªá Microsoft-áá¡ áááá  
áááá áªááááá£á áá®áá 
á¢áááá¤áááááá, ááááá "
+"ááááá¯ááá ááááááááá, á 
áááááááááª á¨áá¡áá«ááááááá [Tor-áá 
áá£ááá áá¡ Android-áá](#tor-"
+"browser-for-android) ááá§ááááá."
 
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.title)

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

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

2021-03-18 Thread translation

commit 23b51d7044dae1da1ba98912c7f223f3e68a6287
Author: Translation commit bot 
Date:   Thu Mar 18 19:46:57 2021 +

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

diff --git a/contents+ka.po b/contents+ka.po
index 22ca2b8e30..ba3fad2e68 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -2767,6 +2767,8 @@ msgid ""
 "vulnerabilities](https://support.torproject.org/tbb/antivirus-false-;
 "positive/)."
 msgstr ""
+"áááá¯áá , áááááá¡ [áªá á£ áááááá¨á¡, 
ááááá áá ááá ááááá¡á áá/áá "
+"á¡áá¡á£á¡á¢ááááá](https://support.torproject.org/tbb/antivirus-false-positive/)."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
@@ -2774,6 +2776,8 @@ msgid ""
 "You can read more about this on our [Support "
 "Portal](https://support.torproject.org/tbb/tbb-10/)."
 msgstr ""
+"áá áªááá, áááá¡ á¨áá¡áá®áá áá®ááááá 
á©áááá [áá®áá ááááá áá¡ "
+"á¡ááá¢áá](https://support.torproject.org/tbb/tbb-10/)."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
@@ -2781,6 +2785,8 @@ msgid ""
 "The following antivirus and firewall software have been known to interfere "
 "with Tor and may need to be temporarily disabled:"
 msgstr ""
+"áááªááá£áá ááá¢áááá á£á¡á áá 
á¥á¡áááá¡ á¤áá á áªááááááá, á áá áá¤áá 
á®ááá¡ Tor-á¡, á¨áá¡áá«ááá, "
+"ááá¡á áá ááááá ááááá¨áá áá§áá¡ 
á¡áááá á:"
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
@@ -2805,12 +2811,12 @@ msgstr "* Microsoft Security Essentials"
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid "* Avast Antivirus"
-msgstr ""
+msgstr "* Avast Antivirus"
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid "* VPNs also tend to interfere with Tor and need to be disabled."
-msgstr ""
+msgstr "* VPN-ááá áá¡ááá áá¤áá á®ááá¡ Tor-á¡ 
áá á¡áááá áá áááá ááááá¨áá."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
@@ -2819,6 +2825,9 @@ msgid ""
 "advanced user who knows how to configure both in a way that doesn't "
 "compromise your privacy."
 msgstr ""
+"áááá¡ááá, áá  ááá á©ááá VPN-áá¡ 
ááááá§áááááá¡ Tor-ááá áá ááá, áá£ áá  
á®áá á áááááªáááá "
+"áááá®ááá ááááá, á áááááááª ááªáá¡ 
áá£ á áááá  ááááá ááá¡ áá ááá áá¡á, á 
áá áá  áááá á¦ááá¡ "
+"áááá®ááá ááááá¡ ááá ááá 
áááááªáááááá¡ á£á¡áá¤á áá®áááá."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
@@ -2826,16 +2835,18 @@ msgid ""
 "You can find more detailed information about Tor + VPN at our "
 "[wiki](https://gitlab.torproject.org/legacy/trac/-/wikis/doc/TorPlusVPN)."
 msgstr ""
+"ááá¬áá áááááá, Tor-áá¡ VPN-ááá 
ááááá§áááááá¡ á¨áá¡áá®áá, 
á¨áááá«áááá áá®áááá [á©áááá¡ "
+"ááááá¨á](https://gitlab.torproject.org/legacy/trac/-/wikis/doc/TorPlusVPN)."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid "* Videos that require Adobe Flash are unavailable."
-msgstr ""
+msgstr "* áááááááá, á áááááááª áá¡áááá 
áááá Adobe Flash, ááá£á¬áááááááá."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid "Flash is disabled for security reasons."
-msgstr ""
+msgstr "Flash ááááá¨á£ááá á£á¡áá¤á áá®ááááá¡ 
áááááá."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
@@ -2846,12 +2857,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid "* The Tor Browser package is dated January 1, 2000 00:00:00 UTC."
-msgstr ""
+msgstr "* Tor-áá áá£ááá áá¡ áá ááá£áá ááááá 
áá¦ááá£ááá 1 ááááá áá, 2000 00:00:00 UTC."
 
 #: https//tb-manual.torproject.org/known-issues/
 #:

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

2021-03-18 Thread translation

commit 8931534dfa38f2a66b19bf0c6c3fad053d902f47
Author: Translation commit bot 
Date:   Thu Mar 18 19:18:34 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
---
 ka/torbutton.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ka/torbutton.properties b/ka/torbutton.properties
index 54abffc5cb..f132af868e 100644
--- a/ka/torbutton.properties
+++ b/ka/torbutton.properties
@@ -102,8 +102,8 @@ onionServices.badAddress=áááªááá£áá 
Onion-á¡ááá¢áá¡ á
 onionServices.badAddress.longDescription=áá áªááá: %S â 
áááªááá£áá .onion-ááá¡áááá áá áá áááá 
áááá£ááá. áá á¨ááªááááá¡ áááááá 
á¨ááá«áááá áá§áá¡ á¨áááááá: 
ááá¡áááá ááá¡ á¡áááá á¯ááá áá  
áááá®áááá, á¡áá¯áá á ááá¡áá¦ááá ed25519 
áá áá¡á¬áá áá áá ááá¨áá¤áá áá áá 
áááá áááá£áá.
 # Tor SOCKS error 0xF7:
 onionServices.introTimedOut.pageTitle=á®áá áááá 
Onion-á¡ááá¢áá¡ á©áá¢ááá áááá¡áá¡
-onionServices.introTimedOut.header=Onion-á¡ááá¢áá¡ á¬á áááá¡ 
á¨áá¥áááá¡ áááá ááááá¬á£á á
-onionServices.introTimedOut=ááá  ááá®áá á®áá 
onion-á¡ááá¢ááá áááá áááá, á¨áá¡áá«ááá 
áªá£áá áááá¨áá áá¡ áááá.
+onionServices.introTimedOut.header=Onion-á¡ááá¢áá¡ á¬á áááá¡ 
á¨áá¥áááá¡ áá á ááááá¬á£á á
+onionServices.introTimedOut=ááá  ááá®áá á®áá 
Onion-á¡ááá¢ááá áááá áááá, á¨áá¡áá«ááá 
á¡á£á¡á¢á áááá¨áá áá¡ áááá.
 onionServices.introTimedOut.longDescription=áá áªááá: %S â 
áááá®ááááá onion-áááá¡áá®á£á áááá¡ááá 
áááá¨áá áá¡ áááá ááááá¬á£á á, 
á¨áá®áááá áá¡ á¬á áááá¡ 
á©áááá§áááááááá¡áá¡.
 #
 # LOCALIZATION NOTE: %S will be replaced with the .onion address.

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

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

2021-03-18 Thread translation

commit 7a83c08df663794b43695fa8e5b69c83ed4a9668
Author: Translation commit bot 
Date:   Thu Mar 18 19:18:04 2021 +

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

diff --git a/contents+ka.po b/contents+ka.po
index 967e9ae759..22ca2b8e30 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -1854,6 +1854,8 @@ msgid ""
 "| XF7 | Onion site Circuit Creation Timed Out | Failed to connect to the "
 "onion site, possibly due to a poor network connection. |"
 msgstr ""
+"| XF7 | Onion-á¡ááá¢áá¡ á¬á áááá¡ á¨áá¥áááá¡ 
áá á ááááá¬á£á á | ááá  ááá®áá á®áá Onion-"
+"á¡ááá¢ááá áááá áááá, á¨áá¡áá«ááá 
á¡á£á¡á¢á áááá¨áá áá¡ áááá. |"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1867,6 +1869,9 @@ msgid ""
 " entered the onion address correctly: even a small mistake will stop Tor "
 "Browser from being able to reach the site."
 msgstr ""
+"áá£ á¡áááá á Onion-áááá¡áá®á£á áááá¡ááá 
á¬áááááá¡ ááá  áá®áá á®ááá, ááá 
á¬áá£áááá á áá "
+"ááá¡áááá áá á¡á¬áá áá á¨ááá§ááá: 
ááªáá á á¨ááªáááááª áá áá  ááá¡áªááá¡ 
Tor-áá áá£ááá á¡ á¡ááá¢ááá "
+"á¬áááááá¡ á¡áá¨á£áááááá¡."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1875,6 +1880,9 @@ msgid ""
 "address, please try again later. There may be a temporary connection issue, "
 "or the site operators may have allowed it to go offline without warning."
 msgstr ""
+"áá£ áááááª ááá  áá®áá á®ááá 
áááááá¨áá áááá¡ Onion-áááá¡áá®á£á 
áááá¡ááá ááá¡áááá ááá¡ "
+"ááááááá¬ááááá¡ á¨áááááááª, 
ááá®ááá á¡áªáááá á®áááá®áá 
ááááááááááá. á¨áá¡áá«ááá áá 
áááááá "
+"á¨áá¤áá á®ááá áá§áá¡ áá á¡ááá¢áá¡ 
á®áááá«á¦ááááááááá ááá£á¤á 
áá®ááááááá ááááááá¨á á®áááááá."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1882,6 +1890,9 @@ msgid ""
 "You can also test if you are able to access other onion services by "
 "connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)."
 msgstr ""
+"áááá¡ááá, Onion-áááá¡áá®á£á ááááááá 
á¬áááááá¡ á¨áá¡áá«ááááááá 
á¨áááá«áááá áááááááá¬ááá "
+"[DuckDuckGo-á¡ Onion-áááá¡áá®á£á 
áááá¡ááá](http://3g2upl4pq6kufc4m.onion/) "
+"áááááá¨áá áááá¡ ááá¨áááááá."
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
@@ -1936,6 +1947,9 @@ msgid ""
 "You can further increase your security by choosing to disable certain web "
 "features that can be used to compromise your security and anonymity."
 msgstr ""
+"ááááá¢áááá, á¨áááá«áááá ááááá 
ááá á£á¡áá¤á áá®áááá, ááááááá 
ááááá ááá áááá£áá á¡áá®áá¡ "
+"á¨áá¡áá«áááááááááá¡ ááááá¨ááá, á 
áááááááª á¡áá®áá¤áááá áá¥áááá 
áááªá£ááááá¡á áá áááááááá¡ "
+"ááá£áá®áááááá¡áááá¡."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1987,6 +2001,9 @@ msgid ""
 "/security-settings-anim.gif\" alt=\"Click on 'Advanced Security Settings' "
 "under the shield menu.\">"
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -2020,6 +2037,9 @@ msgid ""
 "/security-settings-safest.png\" alt=\"Security Level is currently set to "
 "Standard.\">"
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -2120,6 +2140,10 @@ msgid ""
 "indicator when Tor Browser opens. You can update either automatically or "
 "manually."
 msgstr ""
+"Tor-áá áá£ááá á áááááááááá 
ááááá®ááááá¡, á áááá¡ááª áá®ááá ááá 
á¡áá áá¥áááá "
+"á®ááááá¡áá¬ááááá:

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

2021-03-18 Thread translation

commit 328722c12fb7adab42ea4ca48e0ab2413c70a5a8
Author: Translation commit bot 
Date:   Thu Mar 18 19:16:28 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot_completed
---
 contents.pot | 1279 ++
 1 file changed, 753 insertions(+), 526 deletions(-)

diff --git a/contents.pot b/contents.pot
index 2d972f3f94..2b80d7d4be 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-03-05 08:54+CET\n"
+"POT-Creation-Date: 2021-03-18 19:45+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -20,6 +20,10 @@ msgstr "Join the Tor Community"
 msgid "Our community is made up of human rights defenders around the world."
 msgstr "Our community is made up of human rights defenders around the world."
 
+#: https//community.torproject.org/ (content/contents+en.lrpage.section)
+msgid "community"
+msgstr "community"
+
 #: https//community.torproject.org/ (content/contents+en.lrpage.body)
 msgid "The Tor community is made up of all kinds of contributors."
 msgstr "The Tor community is made up of all kinds of contributors."
@@ -62,6 +66,21 @@ msgstr ""
 "Relays are the backbone of the Tor network. Help make Tor stronger and "
 "faster by running a relay today."
 
+#: https//community.torproject.org/relay/
+#: (content/relay-operations/contents+en.lrpage.section)
+#: https//community.torproject.org/user-research/
+#: (content/user-research/contents+en.lrpage.section)
+#: https//community.torproject.org/training/
+#: (content/training/contents+en.lrpage.section)
+#: https//community.torproject.org/onion-services/
+#: (content/onion-services/contents+en.lrpage.section)
+#: https//community.torproject.org/localization/
+#: (content/localization/contents+en.lrpage.section)
+#: https//community.torproject.org/outreach/
+#: (content/outreach/contents+en.lrpage.section)
+msgid "Community"
+msgstr "Community"
+
 #: https//community.torproject.org/relay/
 #: (content/relay-operations/contents+en.lrpage.cta)
 msgid "Grow the Tor network"
@@ -90,10 +109,6 @@ msgstr ""
 
 #: https//community.torproject.org/relay/
 #: (content/relay-operations/contents+en.lrpage.body)
-#: https//community.torproject.org/training/resources/tor-training/
-#: (content/training/resources/tor-training/contents+en.lrslide.description)
-#: https//community.torproject.org/training/resources/all-about-tor/
-#: (content/training/resources/all-about-tor/contents+en.lrslide.description)
 msgid "By running a Tor relay you can help make the Tor network:"
 msgstr "By running a Tor relay you can help make the Tor network:"
 
@@ -186,6 +201,11 @@ msgstr "Project Ideas"
 msgid "Some project ideas for GSoC."
 msgstr "Some project ideas for GSoC."
 
+#: https//community.torproject.org/gsoc/
+#: (content/gsoc/contents+en.lrpage.section)
+msgid "GSoC"
+msgstr "GSoC"
+
 #: https//community.torproject.org/gsoc/ (content/gsoc/contents+en.lrpage.cta)
 msgid "Get coding"
 msgstr "Get coding"
@@ -207,6 +227,10 @@ msgstr ""
 
 #: https//community.torproject.org/training/
 #: (content/training/contents+en.lrpage.title)
+#: https//community.torproject.org/training/checklist/
+#: (content/training/checklist/contents+en.lrpage.section)
+#: https//community.torproject.org/training/faq/
+#: (content/training/faq/contents+en.lrpage.section)
 msgid "Training"
 msgstr "Training"
 
@@ -400,6 +424,21 @@ msgstr ""
 "How to install and configure each type of relay: bridge, guard, middle, and "
 "exit."
 
+#: https//community.torproject.org/relay/setup/
+#: (content/relay-operations/technical-setup/contents+en.lrpage.section)
+#: https//community.torproject.org/relay/relays-requirements/
+#: (content/relay-operations/relays-requirements/contents+en.lrpage.section)
+#: https//community.torproject.org/relay/types-of-relays/
+#: (content/relay-operations/types-of-relays/contents+en.lrpage.section)
+#: https//community.torproject.org/relay/technical-considerations/
+#: 
(content/relay-operations/technical-considerations/contents+en.lrpage.section)
+#: https//community.torproject.org/relay/setup/exit/
+#: (content/relay-operations/technical-setup/exit/contents+en.lrpage.section)
+#: https//community.torproject.org/relay/setup/guard/
+#: (content/relay-operations/technical-setup/guard/contents+en.lrpage.section)
+msgid "relay operations"
+msgstr "relay operations"
+
 #: https//community.torproject.org/relay/setup/
 #: (content/relay-operations/technical-setup/contents+en.lrpage.body)
 msgid ""
@@ -1199,6 +1238,10 @@ msgstr ""
 
 #: https//community.torproject.org/relay/community-resources/
 #: (content/relay-operations/community-resources/contents+en.lrpage.title)
+#: https//community.torproject.org/relay/community-resources/eff-tor-legal-faq/
+#:

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

2021-03-18 Thread translation

commit 4d90e2512f3ba342ab65e692da081ba453304f7e
Author: Translation commit bot 
Date:   Thu Mar 18 18:47:53 2021 +

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

diff --git a/contents+tr.po b/contents+tr.po
index 3a8488866a..088ec837c0 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -7558,6 +7558,9 @@ msgid ""
 "proxies, Tor users that want to connect to the internet, and a broker, that "
 "delivers snowflake proxies to users."
 msgstr ""
+"Bu sistem Ã¼Ã§ bileÅenden oluÅur: Snowflake vekil sunucularÄ±nÄ± 
Ã§alÄ±ÅtÄ±ran "
+"gÃ¶nÃ¼llÃ¼ler, internete baÄlanmak isteyen Tor kullanÄ±cÄ±larÄ± ve 
kullanÄ±cÄ±lara "
+"Snowflake vekil sunucularÄ± saÄlayan bir aracÄ±."
 
 #: https//support.torproject.org/censorship/what-is-snowflake/
 #: (content/censorship/what-is-snowflake/contents+en.lrquestion.description)
@@ -7566,6 +7569,10 @@ msgid ""
 "short-lived proxies on their regular browsers. Check, [how can I use "
 "Snowflake?](/censorship/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?](/censorship/how-can-i-use-"
+"snowflake/) bÃ¶lÃ¼mÃ¼ne bakabilirsiniz"
 
 #: https//support.torproject.org/censorship/what-is-snowflake/
 #: (content/censorship/what-is-snowflake/contents+en.lrquestion.description)
@@ -7575,6 +7582,10 @@ msgid ""
 "technique to make a connection to one of the thousands of snowflake proxies "
 "run by volunteers."
 msgstr ""
+"Snowflake, gÃ¶nÃ¼llÃ¼ler tarafÄ±ndan Ã§alÄ±ÅtÄ±rÄ±lan binlerce Snowflake 
vekil "
+"sunucusundan biriyle baÄlantÄ± kurmak iÃ§in oldukÃ§a etkili [etki alanÄ± "
+"cephesi](https://blog.torproject.org/domain-fronting-critical-open-web) "
+"yÃ¶ntemini kullanÄ±r."
 
 #: https//support.torproject.org/censorship/what-is-snowflake/
 #: (content/censorship/what-is-snowflake/contents+en.lrquestion.description)
@@ -7582,6 +7593,9 @@ msgid ""
 "These proxies are lightweight, ephemeral, and easy to run, allowing us to "
 "scale Snowflake more easily than previous techniques."
 msgstr ""
+"Bu vekil sunucular yÃ¼k oluÅturmaz, kÄ±sa Ã¶mÃ¼rlÃ¼dÃ¼r ve 
Ã§alÄ±ÅtÄ±rÄ±lmasÄ± "
+"kolaydÄ±r. BÃ¶ylece Snowflake Ã¶nceki yÃ¶ntemlerden daha kolay "
+"Ã¶lÃ§eklendirilebilir."
 
 #: https//support.torproject.org/censorship/what-is-snowflake/
 #: (content/censorship/what-is-snowflake/contents+en.lrquestion.description)
@@ -7589,6 +7603,8 @@ msgid ""
 "For censored users, if your Snowflake proxy gets blocked, the broker will "
 "find a new proxy for you, automatically."
 msgstr ""
+"SansÃ¼rlenen kullanÄ±cÄ±lar iÃ§in, Snowflake vekil sunucunuz engellenirse, 
aracÄ±"
+" sizin iÃ§in otomatik olarak yeni bir vekil sunucu bulur."
 
 #: https//support.torproject.org/censorship/what-is-snowflake/
 #: (content/censorship/what-is-snowflake/contents+en.lrquestion.description)
@@ -7597,6 +7613,9 @@ msgid ""
 "[Snowflake Technical Overview](https://keroserene.net/snowflake/technical/) "
 "and the [project page](https://snowflake.torproject.org/)."
 msgstr ""
+"Teknik ayrÄ±ntÄ±lar ve Ã¶zellikler ile ilgileniyorsanÄ±z, [Snowflake Teknik "
+"Ãzeti](https://keroserene.net/snowflake/technical/) ve [proje "
+"sayfasÄ±](https://snowflake.torproject.org/) bÃ¶lÃ¼mlerine bakabilirsiniz."
 
 #: https//support.torproject.org/https/https-1/
 #: (content/https/https-1/contents+en.lrquestion.title)
@@ -7805,6 +7824,9 @@ msgid ""
 "/operator-tools/linux-tor-prio.sh?h=maint-0.3.5) can be found in the Tor "
 "source distribution's contrib directory."
 msgstr ""
+"Tor kaynak daÄÄ±tÄ±mÄ±ndaki contrib klasÃ¶rÃ¼ altÄ±nda [bunu saÄlayacak bir 
"
+"betik](https://gitweb.torproject.org/tor.git/plain/contrib/operator-tools;
+"/linux-tor-prio.sh?h=maint-0.3.5) bulabilirsiniz."
 
 #: https//support.torproject.org/operators/bandwidth-shaping/
 #: (content/operators/bandwidth-shaping/contents+en.lrquestion.description)
@@ -9769,6 +9791,9 @@ msgid ""
 "These services use the special-use top level domain (TLD) .onion (instead of"
 " .com, .net, .org, etc.) and are only accessible through the Tor network."
 msgstr ""
+"Bu hizmetlere eriÅmek iÃ§in Ã¶zel .onion Ã¼st dÃ¼zey etki alanÄ± 
kÄ±saltmasÄ± "
+"(.com, .net, .org, vb yerine) kullanÄ±lÄ±r ve eriÅim yalnÄ±z Tor aÄÄ± 
Ã¼zerinden "
+"saÄlanabilir."
 
 #: https//support.torproject.org/onionservices/onionservices-2/
 #: (content/onionservices/onionservices-2/contents+en.lrquestion.description)
@@ -13400,6 +13425,8 @@ msgstr "Ä°zleme salgÄ±nÄ±ndan korunun."
 #: lego/templates/banner.html:32 templates/banner.html:32
 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
 #:

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

2021-03-18 Thread translation

commit 0b39b777c99c5da750bc20491055c261629393a8
Author: Translation commit bot 
Date:   Thu Mar 18 18:47:49 2021 +

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

diff --git a/contents+tr.po b/contents+tr.po
index 64b36cd0a0..40242c2452 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -7,8 +7,8 @@
 # ErdoÄan Åahin, 2019
 # dersteppenwolfx, 2019
 # Gus, 2020
-# Kaya Zeren , 2021
 # Emma Peel, 2021
+# Kaya Zeren , 2021
 # 
 msgid ""
 msgstr ""
@@ -16,7 +16,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-03-01 14:59+CET\n"
 "PO-Revision-Date: 2019-03-09 10: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"
@@ -359,7 +359,7 @@ msgstr ""
 #: https//www.torproject.org/releases/tor-browser-95/
 #: (content/releases/tor-browser-95/contents+en.lrpage.body)
 msgid "**Onion Authentication**"
-msgstr ""
+msgstr "**Onion Kimlik DoÄrulamasÄ±**"
 
 #: https//www.torproject.org/releases/tor-browser-95/
 #: (content/releases/tor-browser-95/contents+en.lrpage.body)
@@ -368,6 +368,9 @@ msgid ""
 "their website can now set a pair of keys for access control and "
 "authentication."
 msgstr ""
+"Web sitelerine fazladan bir gÃ¼venlik katmanÄ± eklemek isteyen Onion hizmeti "
+"yÃ¶neticileri artÄ±k eriÅim kontrolÃ¼ ve kimlik doÄrulamasÄ± iÃ§in bir 
anahtar "
+"Ã§ifti ayarlayabilir."
 
 #: https//www.torproject.org/releases/tor-browser-95/
 #: (content/releases/tor-browser-95/contents+en.lrpage.body)
@@ -375,6 +378,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//www.torproject.org/releases/tor-browser-95/
 #: (content/releases/tor-browser-95/contents+en.lrpage.body)
@@ -382,6 +387,9 @@ msgid ""
 "Tor Browser users can save keys and manage them via "
 "about:preferences#privacy in the Onion Services Authentication section."
 msgstr ""
+"Tor Browser kullanÄ±cÄ±larÄ± anahtarlarÄ± kaydedebilir ve Onion Hizmetleri "
+"Kimlik DoÄrulamasÄ± bÃ¶lÃ¼mÃ¼ndeki about:preferences#privacy bÃ¶lÃ¼mÃ¼nden "
+"yÃ¶netebilir."
 
 #: https//www.torproject.org/releases/tor-browser-95/
 #: (content/releases/tor-browser-95/contents+en.lrpage.body)
@@ -389,6 +397,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//www.torproject.org/releases/tor-browser-95/
 #: (content/releases/tor-browser-95/contents+en.lrpage.body)
@@ -397,6 +407,10 @@ msgid ""
 " auth.](https://community.torproject.org/onion-services/advanced/client-;
 "auth/)"
 msgstr ""
+"YazÄ±lÄ±m geliÅtiricisi iseniz, [istemci kimlik doÄrulamasÄ± kullanarak 
onion "
+"hizmetinizin gÃ¼venliÄini nasÄ±l saÄlayacaÄÄ±nÄ±zÄ±] "
+"Ã¶Ärenin](https://community.torproject.org/onion-services/advanced/client-;
+"auth/)"
 
 #: https//www.torproject.org/releases/tor-browser-95/
 #: (content/releases/tor-browser-95/contents+en.lrpage.body)
@@ -1152,6 +1166,8 @@ msgstr "Ä°zleme salgÄ±nÄ±ndan korunun."
 #: lego/templates/banner.html:32 templates/banner.html:32
 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:40 templates/banner.html:40
 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/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties

2021-03-18 Thread translation

commit 38d3b89a49d6c1a3bb7e3a9760da26dbf52c2178
Author: Translation commit bot 
Date:   Thu Mar 18 18:47:19 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
---
 ka/torbutton.properties | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ka/torbutton.properties b/ka/torbutton.properties
index 8aa349efb6..54abffc5cb 100644
--- a/ka/torbutton.properties
+++ b/ka/torbutton.properties
@@ -68,7 +68,7 @@ onionServices.errorPage.onionSite=Onion-á¡ááá¢á
 # Tor SOCKS error 0xF0:
 onionServices.descNotFound.pageTitle=á®áá áááá 
Onion-á¡ááá¢áá¡ á©áá¢ááá áááá¡áá¡
 onionServices.descNotFound.header=Onion-á¡ááá¢á áá  
áááá«áááá
-onionServices.descNotFound=á£ááá¢áá¡áá áááá¡ 
á¨áááááá, á áá onion-á¡ááá¢á á®ááááá 
áá¨áá. ááá£áááá¨áá ááá onion-á¡ááá¢áá¡ 
áááááá®áááááá¡.
+onionServices.descNotFound=á£ááá¢áá¡áá á¨áááááá 
áááá¡á, á áá Onion-á¡ááá¢á áá áá á®áááá. 
ááá£áááá¨áá ááá Onion-á¡ááá¢áá¡ 
á®áááá«á¦ááááááááá¡.
 onionServices.descNotFound.longDescription=áá áªááá: %S â 
áááá®áááááá onion-áááá¡áá®á£á áááá¡ 
áá¦áá¬áá á ááá  áááá«áááá hashring-áá áá 
ááá áááá, ááá£á¬áááááááá 
áááá®ááá ááááá¡áááá¡.
 # Tor SOCKS error 0xF1:
 onionServices.descInvalid.pageTitle=á®áá áááá 
Onion-á¡ááá¢áá¡ á©áá¢ááá áááá¡áá¡
@@ -78,7 +78,7 @@ onionServices.descInvalid.longDescription=áá áªááá: 
%S â ááá
 # Tor SOCKS error 0xF2:
 onionServices.introFailed.pageTitle=á®áá áááá 
Onion-á¡ááá¢áá¡ á©áá¢ááá áááá¡áá¡
 onionServices.introFailed.header=Onion-á¡ááá¢á 
ááááá¨á£ááá
-onionServices.introFailed=á£ááá¢áá¡áá áááá¡ 
á¨áááááá, á áá onion-á¡ááá¢á á®ááááá 
áá¨áá. ááá£áááá¨áá ááá onion-á¡ááá¢áá¡ 
áááááá®áááááá¡.
+onionServices.introFailed=á£ááá¢áá¡áá á¨áááááá 
áááá¡á, á áá Onion-á¡ááá¢á áá áá á®áááá. 
ááá£áááá¨áá ááá Onion-á¡ááá¢áá¡ 
á®áááá«á¦ááááááááá¡.
 onionServices.introFailed.longDescription=áá áªááá: %S â á¬áá 
ááááá ááá  ááá®áá á®áá, á ááª 
ááá¨áááá¡, á áá áá¦áá¬áá á 
áááááááá, áááá áá áááá¡áá®á£á ááá 
áá¦áá áá áááááá¨áá ááá£áá á¬áá 
áááááá¡ á¬áá á¢ááááá. á£ááá¢áá¡áá, 
ááááá¬ááá£ááá áááá¡áá®á£á áááá¡ 
áááá  áá¦áá¬áá áá¡ á¨ááªáááá áá 
áá£á¨ááááá¡ á¨áá©áá áááá.
 # Tor SOCKS error 0xF3:
 onionServices.rendezvousFailed.pageTitle=á®áá áááá 
Onion-á¡ááá¢áá¡ á©áá¢ááá áááá¡áá¡
@@ -87,18 +87,18 @@ onionServices.rendezvousFailed=Onion-á¡ááá¢á 
áááááááá£á
 onionServices.rendezvousFailed.longDescription=áá áªááá: %S â 
áááá®ááá ááááá¡ áááá¡áá®á£á 
áááá¡ááá á¨áá¬á§ááá ááá  ááá®áá á®áá, 
á ááª ááá¨áááá¡ á áá áááá®ááá 
áááááá áááá¨áá á ááá  áááá¡á á£áá.
 # Tor SOCKS error 0xF4:
 onionServices.clientAuthMissing.pageTitle=á¡áááá áááá¡ 
á¨áá¡áááá¡ ááááá¬ááááá¡
-onionServices.clientAuthMissing.header=Onion-áááá¡áá®á£á 
áááá¡ á¡áááá áááá¡ á¨áá¡áááá¡ 
ááááá¬ááááá¡
-onionServices.clientAuthMissing=Onion-á¡ááá¢ááá 
á¬áááááá¡áááá¡, á¡áááá áá 
ááá¡áá¦ááá á ááááááª áá  
ááá¬ááááá£áá.
+onionServices.clientAuthMissing.header=Onion-áááá¡áá®á£á ááá 
á¡áááá áááá¡ á¨áá¡áááá¡ ááááá¬ááááá¡
+onionServices.clientAuthMissing=Onion-á¡ááá¢ááá 
á¬áááááá¡áááá¡, á¡áááá áá 
ááá¡áá¦ááá á ááááááª áá  
áááááááá£áá.
 onionServices.clientAuthMissing.longDescription=áá áªááá: %S â 
áááá®ááá áááááá á©áááá¢ááá áá 
áááá®áááááá onion-áááá¡áá®á£á áááá¡

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

2021-03-18 Thread translation

commit cf1a8fb1e0355924844db1cea0de07d53399a95c
Author: Translation commit bot 
Date:   Thu Mar 18 18:46:59 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+ka.po | 50 +-
 contents+tr.po |  6 --
 2 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/contents+ka.po b/contents+ka.po
index db4b09a41c..967e9ae759 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -539,6 +539,10 @@ msgid ""
 "Tab â Select \"Run them\" or \"Ask what to do\" under \"Executable Text "
 "Files\"."
 msgstr ""
+"á¡ááááªáááá, Tor-áá áá£ááá á á áá 
áááá¨ááá¡, ááá°á§áááá áááááááááá¡: 
ááá®á¡áááá âFilesâ "
+"(GNOME Files/Nautilus) â á¨ááááá âPreferencesâ â áá 
âBehaviorâ á©áááá ááá â "
+"ááá á©ááá âRun themâ áá âAsk what to doâ 
áááá§áá¤áááááá¨á âExecutable Text "
+"Filesâ."
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
@@ -546,6 +550,8 @@ msgid ""
 "If you choose the latter click on \"Run\" after launching the start-tor-"
 "browser.desktop file."
 msgstr ""
+"áá£ áá á£ááááá¡ááááá¡ ááá á©ááá, 
ááá¬ááááá âRunâ ááá¡ á¨ááááá, á ááª 
áááá¨áááá á¤áááá "
+"start-tor-browser.desktop."
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
@@ -1598,6 +1604,7 @@ msgid ""
 "You can learn more about the onion site that you are visiting by looking at "
 "the Circuit Display."
 msgstr ""
+"áá áªááá, áá®ááááá Onion-á¡ááá¢áá¡ 
á¨áá¡áá®áá á ááááá¡ááª á¡á¢á£áá ááá, á¬á 
áááá¡ ááá¨áááááá."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1605,6 +1612,8 @@ msgid ""
 "Another way to learn about an onion site is if the website administrator has"
 " implemented a feature called Onion-Location."
 msgstr ""
+"ááááá áá áá á¡áá¨á£ááááá, 
Onion-á¡ááá¢áá ááá¤áá áááªááá¡ 
ááá¡áá¦áááá, áá£ á¡ááá¢áá¡ áá¤áááááá¡"
+" áá¥áá¡ ááááá áááá, áá áá¡ 
Onion-áááááá áááá."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1649,6 +1658,8 @@ msgid ""
 "To prioritize an onion site version of a website, you can enable automatic "
 "Onion-Location redirects."
 msgstr ""
+"á¡ááá¢áá¡ Onion-ááá á¡ááá¡áááá¡ á£ááá 
áá¢áá¡áááá¡ ááá¡ááááááááá, 
á¨áááá«áááá á©áá ááá Onion-"
+"áááááá áááááá ááá¢áááá¢á£á á 
ááááááá¡áááá áááá."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1658,6 +1669,9 @@ msgid ""
 "entry \"Prioritize .onion sites when known.\" and check the option "
 "\"Always\"."
 msgstr ""
+"ááá¬ááááá áááááá  ááááá£á¡ (â¡), 
ááááááá ááá áááá¢á áááá, ááá 
á©ááá ááá ááá£áááá áá "
+"á£á¡áá¤á áá®áááá, á¡ááááª 
Onion-áááá¡áá®á£á áááááá¡ áá áá¨á 
ááá®ááá âá£ááá áá¢áá¡ááá .onion-"
+"á¡ááá¢ááá¡ ááááªááááá¡áá¡â áá 
ááááá¨ááá âá§áááááááá¡â."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1665,11 +1679,13 @@ msgid ""
 "Or, if you're already running Tor Browser, you can copy and paste this "
 "string in a new tab: `about:preferences#privacy` and change this setting."
 msgstr ""
+"áá, áá£ á£ááá ááá¨áááá£áá ááá¥áá 
Tor-áá áá£ááá á, á¨áááá«áááá áá®áá 
á©áááá áá¨á á©áá¡ááá "
+"áá¡áá áááªááá£áá ááá¡áááá ááá¡: 
`about:preferences#privacy` áá á¨ááªááááá ááá 
áááá¢á á."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
 msgid "## ONION SERVICE AUTHENTICATION"
-msgstr ""
+msgstr "## ONION-áááá¡áá®á£á áááá¡ 
ááááá¬áááá"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1686,6 +1702,8 @@ msgstr ""
 msgid ""
 "As a Tor user, you may authenticate yourself directly in the Tor

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

2021-03-18 Thread translation

commit 6acbda514c2e948986c0dc5464ee5d057744a775
Author: Translation commit bot 
Date:   Thu Mar 18 18:18:06 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+es.po |  2 +-
 contents+tr.po | 43 ++-
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index e070a88247..677a8affdc 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -180,7 +180,7 @@ msgid ""
 "You should not install any additional add-ons on Tor Browser because that "
 "can compromise some of its privacy features."
 msgstr ""
-"No deberÃas instalar ningÃºn otro complemento en Tor Browser, ya que  
podrÃa "
+"No deberÃas instalar ningÃºn otro complemento en Tor Browser, ya que  puedes 
"
 "comprometer tu privacidad."
 
 #: https//support.torproject.org/glossary/antivirus-software/
diff --git a/contents+tr.po b/contents+tr.po
index acdd1f8075..3a8488866a 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -7399,6 +7399,9 @@ msgid ""
 "click on 'Configure' on the start-up screen and then select 'Tor is censored"
 " in my country'."
 msgstr ""
+"MasaÃ¼stÃ¼ iÃ§in Tor Browser Alpha sÃ¼rÃ¼mÃ¼nÃ¼ ilk kez 
Ã§alÄ±ÅtÄ±rÄ±yorsanÄ±z, "
+"baÅlangÄ±Ã§ ekranÄ±nda 'YapÄ±landÄ±r' Ã¼zerine tÄ±klayÄ±p ardÄ±ndan 
'BulunduÄum "
+"Ã¼lkede Tor aÄÄ± engelleniyor' seÃ§eneÄini seÃ§ebilirsiniz."
 
 #: https//support.torproject.org/censorship/how-can-i-use-snowflake/
 #: 
(content/censorship/how-can-i-use-snowflake/contents+en.lrquestion.description)
@@ -7406,6 +7409,8 @@ msgid ""
 "Click on 'Select a built-in bridge' and choose 'snowflake' from the dropdown"
 " menu."
 msgstr ""
+"'HazÄ±r kÃ¶prÃ¼lerden seÃ§ilsin' Ã¼zerine tÄ±klayÄ±n ve aÃ§Ä±lÄ±r menÃ¼den 
'snowflake' "
+"seÃ§in."
 
 #: https//support.torproject.org/censorship/how-can-i-use-snowflake/
 #: 
(content/censorship/how-can-i-use-snowflake/contents+en.lrquestion.description)
@@ -7414,6 +7419,8 @@ msgid ""
 "menu](https://support.torproject.org/glossary/hamburger-menu/) then go to "
 "'Preferences' and go to 'Tor'."
 msgstr ""
+"TarayÄ±cÄ± iÃ§inde [hamburger 
menÃ¼sÃ¼ne](https://support.torproject.org/glossary;
+"/hamburger-menu/) ve 'Ayarlar' Ã¼zerine tÄ±klayÄ±p 'Tor' bÃ¶lÃ¼mÃ¼ne gidin."
 
 #: https//support.torproject.org/censorship/how-can-i-use-snowflake/
 #: 
(content/censorship/how-can-i-use-snowflake/contents+en.lrquestion.description)
@@ -7422,11 +7429,15 @@ msgid ""
 "Check 'Use a Bridge' and 'Use a built-in bridge'. Then select 'snowflake' "
 "from the dropdown menu."
 msgstr ""
+"Alternatif olarak adres satÄ±rÄ±na `about:preferences#tor` yazabilirsiniz. "
+"'Bir KÃ¶prÃ¼ KullanÄ±lsÄ±n' ve 'HazÄ±r kÃ¶prÃ¼lerden seÃ§ilsin' 
seÃ§eneklerini "
+"iÅaretleyin. ArdÄ±ndan aÃ§Ä±lan menÃ¼den 'snowflake' seÃ§in."
 
 #: https//support.torproject.org/censorship/how-to-help-running-snowflake/
 #: 
(content/censorship/how-to-help-running-snowflake/contents+en.lrquestion.title)
 msgid "How to help running Snowflake proxies?"
 msgstr ""
+"Snowflake vekil sunucularÄ±nÄ±n iÅletilmesine nasÄ±l yardÄ±mcÄ± olabilirim?"
 
 #: https//support.torproject.org/censorship/how-to-help-running-snowflake/
 #: 
(content/censorship/how-to-help-running-snowflake/contents+en.lrquestion.description)
@@ -7434,6 +7445,8 @@ msgid ""
 "If your internet access is not censored, you should consider installing the "
 "Snowflake extension to help users in censored networks."
 msgstr ""
+"Ä°nternet eriÅiminiz sansÃ¼rlenmiyorsa, sansÃ¼rlenen aÄlardaki 
kullanÄ±cÄ±lara "
+"yardÄ±mcÄ± olmak iÃ§in Snowflake eklentisini kurabilirsiniz."
 
 #: https//support.torproject.org/censorship/how-to-help-running-snowflake/
 #: 
(content/censorship/how-to-help-running-snowflake/contents+en.lrquestion.description)
@@ -7441,16 +7454,18 @@ msgid ""
 "When you run Snowflake on you regular browser, you will provide connection "
 "as a proxy to an entry node in the Tor Network, and thatâs all."
 msgstr ""
+"Snowflake uygulamasÄ±nÄ± normal tarayÄ±cÄ±nÄ±zda Ã§alÄ±ÅtÄ±rdÄ±ÄÄ±nÄ±zda, 
Tor aÄÄ±ndaki "
+"bir giriÅ dÃ¼ÄÃ¼mÃ¼ne vekil sunucu olarak baÄlantÄ± saÄlarsÄ±nÄ±z. Hepsi 
bu kadar."
 
 #: https//support.torproject.org/censorship/how-to-help-running-snowflake/
 #: 
(content/censorship/how-to-help-running-snowflake/contents+en.lrquestion.description)
 msgid " Add-on"
-msgstr ""
+msgstr " Eklenti"
 
 #: https//support.torproject.org/censorship/how-to-help-running-snowflake/
 #: 
(content/censorship/how-to-help-running-snowflake/contents+en.lrquestion.description)
 msgid "Firstly make sure you have WebRTC enabled."
-msgstr ""
+msgstr "Ãncelikle WebRTC Ã¶zelliÄinin etkinleÅtirilmiÅ olduÄundan emin 
olun."
 
 #: https//support.torproject.org/censorship/how-to-help-running-snowflake/
 #: 
(content/censorship/how-to-help-running-snowflake/contents+en.lrquestion.description)
@@ -7460,6 +7475,10 @@ msgid ""
 
"Chrome](https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie)"
 " which

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

2021-03-18 Thread translation

commit c3a8d283e475a694a793be6457c60cbbeabd90f0
Author: Translation commit bot 
Date:   Thu Mar 18 18:17:09 2021 +

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

diff --git a/contents+ka.po b/contents+ka.po
index ec2f1f7bd1..db4b09a41c 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -528,6 +528,8 @@ msgid ""
 "**Note:** On Ubuntu and some other distros if you try to launch the start-"
 "tor-browser.desktop file a text file might open up."
 msgstr ""
+"**á¨áááá¨ááá:** Ubuntu-á¡á áá áááááá á 
á¡á®áá ááá¡á¢á ááá£á¢áááá, áá£ 
á¨áááªááááá ááá£á¨ááá "
+"start-tor-browser.desktop, á¨áá¡áá«ááá á¢áá¥á¡á¢á£á á 
á¤áááá áááá®á¡ááá¡."
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)

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

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

2021-03-18 Thread translation

commit ca61346844f3d9a178f3e91aaf42be2bda21f67a
Author: Translation commit bot 
Date:   Thu Mar 18 18:15:55 2021 +


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

diff --git a/tr/messages.json b/tr/messages.json
index a770ddc89b..ce2f981cca 100644
--- a/tr/messages.json
+++ b/tr/messages.json
@@ -36,7 +36,7 @@
 "message": "Ãerezler etkin deÄil."
   },
   "websiteIntro": {
-"message": "Snowflake is a system to defeat internet censorship. People 
who are censored can use Snowflake to access the internet. Their connection 
goes through Snowflake proxies, which are run by volunteers. For more detailed 
information about how Snowflake works see our https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\;>documentation
 wiki."
+"message": "Snowflake Ä°nternet sansÃ¼rÃ¼nÃ¼ aÅmaya yÃ¶nelik bir 
sistemdir. SansÃ¼re uÄrayan kiÅiler, Snowflake kullanarak Ä°nternete 
eriÅebilir. BaÄlantÄ±, gÃ¶nÃ¼llÃ¼ler tarafÄ±ndan iÅletilen Snowflake vekil 
sunucularÄ± Ã¼zerinden kurulur. Snowflake hakkÄ±nda ayrÄ±ntÄ±lÄ± bilgi almak 
iÃ§in https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\;>belgeler 
viki sayfamÄ±za bakabilirsiniz."
   },
   "browser": {
 "message": "TarayÄ±cÄ±"
@@ -63,10 +63,10 @@
 "message": "Bir istemci ya da vekil sunucu olarak Snowflake kullanÄ±rken 
sorun yaÅarsanÄ±z, hata bildiriminde bulunmanÄ±z iyi olur. Hata bildirimini 
iki Åekilde gÃ¶nderebilirsiniz:"
   },
   "sharedAccount": {
-"message": "File an https://anonticket.onionize.space/\;>anonymous ticket by generating 
an identifier and logging in with it.  Then, find the Snowflake project in the 
List of all projects and create a new issue."
+"message": "Bir belirteÃ§ Ã¼retip onunla oturum aÃ§arak https://anonticket.onionize.space/\;>anonim bir destek kaydÄ± 
gÃ¶nderebilirsiniz. Daha sonra tÃ¼m projeler listesine giderek 
Snowflake projesini bulun ve yeni bir sorun bildirin."
   },
   "bugTracker": {
-"message": "https://gitlab.onionize.space/\;>Request an 
account at the Tor Project GitLab, then https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/issues\;>open
 a new issue in the Snowflake project."
+"message": "Tor Project GitLab Ã¼zerinde https://gitlab.onionize.space/\;>bir hesap aÃ§Ä±lmasÄ±nÄ± istedikten 
sonra Snowflake projesinde https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/issues\;>yeni
 bir sorun bildirebilirsiniz."
   },
   "descriptive": {
 "message": "LÃ¼tfen bildirim kaydÄ±nda olabildiÄince aÃ§Ä±klayÄ±cÄ± olun 
ve yapabiliyorsanÄ±z hatayÄ± yeniden oluÅturmamÄ±za yardÄ±mcÄ± olabilecek 
gÃ¼nlÃ¼k kayÄ±tlarÄ±nÄ± ekleyin."
@@ -81,9 +81,9 @@
 "message": "Åu Åekilde gÃ¶rÃ¼ntÃ¼lenir:"
   },
   "faq": {
-"message": "FAQ"
+"message": "SSS"
   },
   "support": {
-"message": "See the https://support.torproject.org/censorship/\;>Censorship topic in 
Tor's https://support.torproject.org/\;>Support Portal."
+"message": "Tor https://support.torproject.org/\;>Destek 
PortalÄ±nda bulunan https://support.torproject.org/censorship/\;>SansÃ¼r baÅlÄ±ÄÄ±na 
bakabilirsiniz."
   }
 }

___
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-03-18 Thread translation

commit 7d8574fa1898bf2d47d179d66aebfae1d24e570e
Author: Translation commit bot 
Date:   Thu Mar 18 18:15:54 2021 +


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

diff --git a/tr/messages.json b/tr/messages.json
index c3bfd16869..ce2f981cca 100644
--- a/tr/messages.json
+++ b/tr/messages.json
@@ -36,7 +36,7 @@
 "message": "Ãerezler etkin deÄil."
   },
   "websiteIntro": {
-"message": "Snowflake Ä°nternet sansÃ¼rÃ¼nÃ¼ aÅmaya yÃ¶nelik bir 
sistemdir. SansÃ¼re uÄrayan kiÅiler, Snowflake kullanarak Ä°nternete 
eriÅebilir. BaÄlantÄ±, gÃ¶nÃ¼llÃ¼ler tarafÄ±ndan iÅletilen Snowflake vekil 
sunucularÄ± Ã¼zerinden kurulur. Snowflake hakkÄ±nda information about how 
Snowflake works see our https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\;>belgeler 
viki sayfamÄ±za bakabilirsiniz."
+"message": "Snowflake Ä°nternet sansÃ¼rÃ¼nÃ¼ aÅmaya yÃ¶nelik bir 
sistemdir. SansÃ¼re uÄrayan kiÅiler, Snowflake kullanarak Ä°nternete 
eriÅebilir. BaÄlantÄ±, gÃ¶nÃ¼llÃ¼ler tarafÄ±ndan iÅletilen Snowflake vekil 
sunucularÄ± Ã¼zerinden kurulur. Snowflake hakkÄ±nda ayrÄ±ntÄ±lÄ± bilgi almak 
iÃ§in https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\;>belgeler 
viki sayfamÄ±za bakabilirsiniz."
   },
   "browser": {
 "message": "TarayÄ±cÄ±"
@@ -63,7 +63,7 @@
 "message": "Bir istemci ya da vekil sunucu olarak Snowflake kullanÄ±rken 
sorun yaÅarsanÄ±z, hata bildiriminde bulunmanÄ±z iyi olur. Hata bildirimini 
iki Åekilde gÃ¶nderebilirsiniz:"
   },
   "sharedAccount": {
-"message": "Bir kimlik Ã¼retip onunla giriÅ yaparak https://anonticket.onionize.space/\;>anonim bir sorun 
oluÅturabilirsiniz. Daha sonra tÃ¼m projeler listesinde 
Snowflake projesini bulun ve yeni bir sorun oluÅturun."
+"message": "Bir belirteÃ§ Ã¼retip onunla oturum aÃ§arak https://anonticket.onionize.space/\;>anonim bir destek kaydÄ± 
gÃ¶nderebilirsiniz. Daha sonra tÃ¼m projeler listesine giderek 
Snowflake projesini bulun ve yeni bir sorun bildirin."
   },
   "bugTracker": {
 "message": "Tor Project GitLab Ã¼zerinde https://gitlab.onionize.space/\;>bir hesap aÃ§Ä±lmasÄ±nÄ± istedikten 
sonra Snowflake projesinde https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/issues\;>yeni
 bir sorun bildirebilirsiniz."
@@ -81,9 +81,9 @@
 "message": "Åu Åekilde gÃ¶rÃ¼ntÃ¼lenir:"
   },
   "faq": {
-"message": "S.S.S."
+"message": "SSS"
   },
   "support": {
-"message": "Tor'un https://support.torproject.org/\;>Destek 
PortalÄ±nda, https://support.torproject.org/censorship/\;>SansÃ¼r baÅlÄ±ÄÄ±na 
bakabilirsiniz."
+"message": "Tor https://support.torproject.org/\;>Destek 
PortalÄ±nda bulunan https://support.torproject.org/censorship/\;>SansÃ¼r baÅlÄ±ÄÄ±na 
bakabilirsiniz."
   }
 }

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

[tor-commits] [tpo/master] latest alpha is now 0.4.6.1-alpha

2021-03-18 Thread nickm

commit 346ea51b95c08053feb94940e3a125387289c53d
Author: Nick Mathewson 
Date:   Thu Mar 18 13:50:33 2021 -0400

latest alpha is now 0.4.6.1-alpha
---
 databags/versions.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/databags/versions.ini b/databags/versions.ini
index f5b63c8d..28511581 100644
--- a/databags/versions.ini
+++ b/databags/versions.ini
@@ -24,6 +24,6 @@ version = 10.5a11
 version = 0.4.5.7
 
 [tor-alpha]
-version = 0.4.5.5-rc
+version = 0.4.6.1-alpha
 
 

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

[tor-commits] [tor/master] bump to 0.4.6.1-alpha-dev

2021-03-18 Thread nickm

commit 3f7824ff68f63085fe78b7bc140e6bd3f18fc6b4
Author: Nick Mathewson 
Date:   Thu Mar 18 13:47:57 2021 -0400

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

diff --git a/configure.ac b/configure.ac
index c9023d8663..9649951503 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.6.1-alpha])
+AC_INIT([tor],[0.4.6.1-alpha-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], 
[Flags passed to config
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2021-03-15"], # for 0.4.6.1-alpha
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-03-18"], # for 0.4.6.1-alpha-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 0e5d54bd79..bc02570ce1 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.6.1-alpha"
+!define VERSION "0.4.6.1-alpha-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index de652f15ac..38b10c0e2d 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.6.1-alpha"
+#define VERSION "0.4.6.1-alpha-dev"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR

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

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

2021-03-18 Thread translation

commit 5a059dec6bee2303ba9d40ed023603f11c124931
Author: Translation commit bot 
Date:   Thu Mar 18 17:45:11 2021 +


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

diff --git a/contents+es.po b/contents+es.po
index 9bcf17ac4f..e7a9899c16 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -316,7 +316,7 @@ msgid ""
 "onion service gives your users all the security of HTTPS with the added "
 "privacy benefits of Tor Browser."
 msgstr ""
-"Los servicios cebolla con servicios que solo pueden ser accedidos desde la "
+"Los servicios cebolla son servicios que solo pueden ser accedidos desde la "
 "red Tor. Poner en marcha un servicio cebolla le da a tus usuarios toda la "
 "seguridad de HTTPS ademÃ¡s de los beneficios para la privacidad del Navegador"
 " Tor."

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

[tor-commits] [tor/master] Terminate rep_hist_get_overload_stats_lines() with an NL.

2021-03-18 Thread nickm

commit cd0e5a942eee0f08f4311899c09c6783b2c8e22c
Author: Nick Mathewson 
Date:   Thu Mar 18 13:30:49 2021 -0400

Terminate rep_hist_get_overload_stats_lines() with an NL.

We use it in router.c, where chunks are joined with "", not with
NL... so leaving off the terminating NL will lead to an unparseable
extrainfo.

Found by toralf. Bug not in any released Tor.
---
 src/feature/stats/rephist.c |  8 
 src/test/test_stats.c   | 20 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/feature/stats/rephist.c b/src/feature/stats/rephist.c
index 7c0c28804c..4ad5d46b0c 100644
--- a/src/feature/stats/rephist.c
+++ b/src/feature/stats/rephist.c
@@ -233,7 +233,7 @@ rep_hist_get_overload_stats_lines(void)
   /* First encode the general overload */
   if (overload_happened_recently(overload_stats.overload_general_time, 72)) {
 format_iso_time(tbuf, overload_stats.overload_general_time);
-smartlist_add_asprintf(chunks, "overload-general %d %s",
+smartlist_add_asprintf(chunks, "overload-general %d %s\n",
OVERLOAD_STATS_VERSION, tbuf);
   }
 
@@ -243,7 +243,7 @@ rep_hist_get_overload_stats_lines(void)
 format_iso_time(tbuf, overload_stats.overload_ratelimits_time);
 smartlist_add_asprintf(chunks,
"overload-ratelimits %d %s %" PRIu64 " %" PRIu64
-   " %" PRIu64 " %" PRIu64,
+   " %" PRIu64 " %" PRIu64 "\n",
OVERLOAD_STATS_VERSION, tbuf,
options->BandwidthRate, options->BandwidthBurst,
overload_stats.overload_read_count,
@@ -254,7 +254,7 @@ rep_hist_get_overload_stats_lines(void)
   if (overload_happened_recently(
   overload_stats.overload_fd_exhausted_time, 72)) {
 format_iso_time(tbuf, overload_stats.overload_fd_exhausted_time);
-smartlist_add_asprintf(chunks, "overload-fd-exhausted %d %s",
+smartlist_add_asprintf(chunks, "overload-fd-exhausted %d %s\n",
OVERLOAD_STATS_VERSION, tbuf);
   }
 
@@ -263,7 +263,7 @@ rep_hist_get_overload_stats_lines(void)
 goto done;
   }
 
-  result = smartlist_join_strings(chunks, "\n", 0, NULL);
+  result = smartlist_join_strings(chunks, "", 0, NULL);
 
  done:
   SMARTLIST_FOREACH(chunks, char *, cp, tor_free(cp));
diff --git a/src/test/test_stats.c b/src/test/test_stats.c
index a34713b650..465256a1e1 100644
--- a/src/test/test_stats.c
+++ b/src/test/test_stats.c
@@ -728,7 +728,7 @@ test_overload_stats(void *arg)
 
   /* Now check the string */
   stats_str = rep_hist_get_overload_stats_lines();
-  tt_str_op("overload-general 1 2002-01-03 23:00:00", OP_EQ, stats_str);
+  tt_str_op("overload-general 1 2002-01-03 23:00:00\n", OP_EQ, stats_str);
   tor_free(stats_str);
 
   /* Move the time forward 72 hours: see that the line has disappeared. */
@@ -744,7 +744,7 @@ test_overload_stats(void *arg)
   rep_hist_note_overload(OVERLOAD_GENERAL);
 
   stats_str = rep_hist_get_overload_stats_lines();
-  tt_str_op("overload-general 1 2002-01-07 00:00:00", OP_EQ, stats_str);
+  tt_str_op("overload-general 1 2002-01-07 00:00:00\n", OP_EQ, stats_str);
   tor_free(stats_str);
 
   /* Also note an fd exhaustion event */
@@ -752,7 +752,7 @@ test_overload_stats(void *arg)
 
   stats_str = rep_hist_get_overload_stats_lines();
   tt_str_op("overload-general 1 2002-01-07 00:00:00\n"
-"overload-fd-exhausted 1 2002-01-07 00:00:00", OP_EQ, stats_str);
+"overload-fd-exhausted 1 2002-01-07 00:00:00\n", OP_EQ, stats_str);
   tor_free(stats_str);
 
   /* Move the time forward. Register DNS overload. See that the time changed */
@@ -763,7 +763,7 @@ test_overload_stats(void *arg)
 
   stats_str = rep_hist_get_overload_stats_lines();
   tt_str_op("overload-general 1 2002-01-07 02:00:00\n"
-"overload-fd-exhausted 1 2002-01-07 00:00:00", OP_EQ, stats_str);
+"overload-fd-exhausted 1 2002-01-07 00:00:00\n", OP_EQ, stats_str);
   tor_free(stats_str);
 
   /* Move the time forward. Register a bandwidth ratelimit event. See that the
@@ -780,7 +780,7 @@ test_overload_stats(void *arg)
   stats_str = rep_hist_get_overload_stats_lines();
   tt_str_op("overload-general 1 2002-01-07 02:00:00\n"
 "overload-ratelimits 1 2002-01-07 04:00:00 1000 2000 1 0\n"
-"overload-fd-exhausted 1 2002-01-07 00:00:00", OP_EQ, stats_str);
+"overload-fd-exhausted 1 2002-01-07 00:00:00\n", OP_EQ, stats_str);
   tor_free(stats_str);
 
   /* Move the time forward 24 hours: no rate limit line anymore. */
@@ -789,7 +789,7 @@ test_overload_stats(void *arg)
 
   stats_str = rep_hist_get_overload_stats_lines();
   tt_str_op("overload-general 1 2002-01-07 02:00:00\n"
-"overload-fd-exhausted 1 2002-01-07 00:00:00", OP_EQ, stats_str);
+"overload-fd-exhausted 1 2002-01-07 00:00:00\n", OP_EQ, stats_str);

[tor-commits] [tor/master] Minor edits to changelog

2021-03-18 Thread nickm

commit 411db63fc36878af2627e43d3e64f607a1979a92
Author: Nick Mathewson 
Date:   Thu Mar 18 10:16:37 2021 -0400

Minor edits to changelog
---
 ChangeLog | 59 ++-
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e4c0dc431e..646e0c8629 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,13 +14,13 @@ Changes in version 0.4.6.1-alpha - 2021-03-18
   Neel Chauhan.
 
   o Major features (directory authorityl):
-- When voting for a relay with a Sybil-like appearance, add the
-  Sybil flag when clearing out the other flags. This lets a relay
-  operator know why their relay hasn't been voted on. Closes ticket
-  40255. Patch by Neel Chauhan.
+- When voting on a relay with a Sybil-like appearance, add the Sybil
+  flag when clearing out the other flags. This lets a relay operator
+  know why their relay hasn't been included in the consensus. Closes
+  ticket 40255. Patch by Neel Chauhan.
 
   o Major features (metrics):
-- Relays now report how overloaded they are in their extra-info
+- Relays now report how overloaded they are in their extrainfo
   documents. This information is controlled with the
   OverloadStatistics torrc option, and it will be used to improve
   decisions about the network's load balancing. Implements proposal
@@ -31,7 +31,7 @@ Changes in version 0.4.6.1-alpha - 2021-03-18
   connections for relays. Closes ticket 40253.
 
   o Major features (statistics):
-- Relays now also publish statistics about the number of v3 onion
+- Relays now publish statistics about the number of v3 onion
   services and volume of v3 onion service traffic, in the same
   manner they already do for v2 onions. Closes ticket 23126.
 
@@ -52,9 +52,9 @@ Changes in version 0.4.6.1-alpha - 2021-03-18
   we alter our estimate Xm by taking the maximum of the top 10 most
   common build time values of the 10ms histogram, and compute Xm as
   the average of these. Fixes bug 40168; bugfix on 0.2.2.14-alpha.
-- Remove max_time calculation and associated warn from circuit build
-  timeout 'alpha' parameter estimation, as this is no longer needed
-  by our new estimator from 40168. Fixes bug 34088; bugfix
+- Remove max_time calculation and associated warning from circuit
+  build timeout 'alpha' parameter estimation, as this is no longer
+  needed by our new estimator from 40168. Fixes bug 34088; bugfix
   on 0.2.2.9-alpha.
 
   o Major bugfixes (signing key):
@@ -85,27 +85,27 @@ Changes in version 0.4.6.1-alpha - 2021-03-18
   relay fingerprint. Closes ticket 33632. Patch by Neel Chauhan.
 
   o Minor features (control port, stream handling):
-- Add the stream ID argument to the event line in the ADDRMAP
-  control event. Closes ticket 40249. Patch by Neel Chauhan.
+- Add the stream ID to the event line in the ADDRMAP control event.
+  Closes ticket 40249. Patch by Neel Chauhan.
 
   o Minor features (dormant mode):
-- Add a new 'DormantTimeoutEnabled' option to allow coarse-grained
-  control over whether the client ever becomes dormant from
+- Add a new 'DormantTimeoutEnabled' option for coarse-grained
+  control over whether the client can become dormant from
   inactivity. Most people won't need this. Closes ticket 40228.
 
   o Minor features (logging):
-- Change the DoS subsystem heartbeat line format so be more clear on
-  what has been detected/rejected and which option is disabled if
-  any. Closes ticket 40308.
+- Change the DoS subsystem heartbeat line format to be more clear on
+  what has been detected/rejected, and which option is disabled (if
+  any). Closes ticket 40308.
 - In src/core/mainloop/mainloop.c and src/core/mainloop/connection.c,
   put brackets around IPv6 addresses in log messages. Closes ticket
   40232. Patch by Neel Chauhan.
 
   o Minor features (performance, windows):
 - Use SRWLocks to implement locking on Windows. Replaces the
-  critical section locking implementation with the faster SRWLocks
-  available since Windows Vista. Closes ticket 17927. Patch by
-  Daniel Pinto.
+  "critical section" locking implementation with the faster
+  SRWLocks, available since Windows Vista. Closes ticket 17927.
+  Patch by Daniel Pinto.
 
   o Minor features (protocol, proxy support, defense in depth):
 - Close HAProxy connections if they somehow manage to send us data
@@ -118,16 +118,16 @@ Changes in version 0.4.6.1-alpha - 2021-03-18
 
   o Minor features (vote document):
 - Add a "stats" line to directory authority votes, to report various
-  statistics that authorities computed about the relays. This will
+  statistics that authorities compute about the relays. This will
   help us diagnose the network better. Closes ticket 40314.
 
   o Minor bugfixes (build):
--

[tor-commits] [community/master] Updated "Report a problem with a translation" page

2021-03-18 Thread emmapeel

commit 4518f47a894d7220a7178c4882084f83e9125163
Author: Goodiec 
Date:   Sat Oct 10 22:09:03 2020 +0100

Updated "Report a problem with a translation" page

Updated "Report a problem with a translation" page
---
 content/localization/translation-problem/contents.lr | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/localization/translation-problem/contents.lr 
b/content/localization/translation-problem/contents.lr
index 26ce65a..430aafd 100644
--- a/content/localization/translation-problem/contents.lr
+++ b/content/localization/translation-problem/contents.lr
@@ -19,7 +19,7 @@ body:
 ### Reporting an error with a translation
 
 * If you are already a [Tor translator](../becoming-tor-translator), you can 
simply find the string and fix it in 
[transifex](https://www.transifex.com/otf/torproject/).
-* If you don't know how to find the string to fix, you can [open a ticket on 
our Bugtracker](https://support.torproject.org/misc/bug-or-feedback/), under 
the **Community/Translations** component.
-  Before opening a ticket, see the currently [open tickets for 
Translations](https://trac.torproject.org/projects/tor/query?status=accepted=assigned=merge_ready=needs_information=needs_review=needs_revision=new=reopened=Community%2FTranslations=priority)
 because maybe it is already reported.
+* If you don't know how to find the string to fix, you can [open a ticket on 
our Bugtracker](https://support.torproject.org/misc/bug-or-feedback/), under 
the **Community/Localization** repository.
+  Before opening a ticket, see the currently [open tickets for 
Translations](https://github.com/torproject/community/tree/master/content/localization)
 because maybe it is already reported.
 * You can send an email to the [tor localization mailing 
list](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-l10n).
 * You can report such issues on 
[irc](https://support.torproject.org/get-in-touch/#irc-help), on the #tor-l10n 
channel on the oftc network (you may need to be registered to log in).



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

[tor-commits] [community/master] Merge remote-tracking branch 'goodiec/patch-1'

2021-03-18 Thread emmapeel

commit b21d2b5d3eebc00077e14bb5674bb9d7a01082a6
Merge: 38a039d 4518f47
Author: emma peel 
Date:   Thu Mar 18 16:38:43 2021 +0100

Merge remote-tracking branch 'goodiec/patch-1'
will-close: https://gitlab.torproject.org/tpo/web/community/-/issues/158

 content/localization/translation-problem/contents.lr | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

[tor-commits] [tor-browser-build/maint-10.0-desktop] Release preparation for 10.0.14

2021-03-18 Thread gk

commit 4eb612dea332b0cea783267ec55790d88846b74c
Author: Matthew Finkel 
Date:   Thu Mar 18 15:17:17 2021 +

Release preparation for 10.0.14

Versions bump and Changelog update
---
 projects/firefox-langpacks/config   |  2 +-
 projects/firefox/config |  4 ++--
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 10 ++
 projects/tor-browser/config |  4 ++--
 projects/tor/config |  2 +-
 rbm.conf|  3 ++-
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/projects/firefox-langpacks/config 
b/projects/firefox-langpacks/config
index 17a707a..34d6fad 100644
--- a/projects/firefox-langpacks/config
+++ b/projects/firefox-langpacks/config
@@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") 
%]-[% c("var/buil
 
 var:
   ff_version: '[% pc("firefox", "var/firefox_version") %]'
-  ff_build: build2
+  ff_build: build1
   input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
 
 targets:
diff --git a/projects/firefox/config b/projects/firefox/config
index 035ccca..0830aa0 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,14 +1,14 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% 
c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-1-build2'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-1-build1'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 git_submodule: 1
 gpg_keyring: torbutton.gpg
 
 var:
-  firefox_platform_version: 78.8.0
+  firefox_platform_version: 78.9.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 10.0
   branding_directory: 'browser/branding/alpha'
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt 
b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 426c0c3..617a77a 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,13 @@
+Tor Browser 10.0.14 -- March 23 2021
+ * Windows + OS X + Linux
+   * Update Firefox to 78.9.0esr
+   * Update NoScript to 11.2.3
+   * Update Tor to 0.4.5.7
+   * Bug 40031: Remove survey banner on TB-stable [torbutton]
+ * Build System
+   * Windows
+ * Bug 40249: Bump mingw-w64 and clang for Firefox 78.9 [tor-browser-build]
+
 Tor Browser 10.0.13 -- March 3 2021
  * Linux
* Bug 40328: Fix instability after upgrading to glibc 2.33 [tor-browser]
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index acd0dff..20d920d 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -77,9 +77,9 @@ input_files:
 enable: '[% c("var/snowflake") && ! c("var/android") %]'
   - filename: Bundle-Data
 enable: '[% ! c("var/android") %]'
-  - URL: 
https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.2.2-an+fx.xpi
+  - URL: 
https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.2.3-an+fx.xpi
 name: noscript
-sha256sum: 1d8126b5b76229d98b7f531879a1f59d16eecca32f8d6cede4d7ff9113f4e41a
+sha256sum: eafc5f5be40d33a34d757940b5391455dad166921c880ee67daab056078d51ae
   - filename: 'RelativeLink/start-tor-browser.desktop'
 enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/projects/tor/config b/projects/tor/config
index ab5458a..edd6391 100644
--- a/projects/tor/config
+++ b/projects/tor/config
@@ -1,6 +1,6 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% 
c("var/build_id") %]'
-version: 0.4.5.6
+version: 0.4.5.7
 git_hash: 'tor-[% c("version") %]'
 git_url: https://git.torproject.org/tor.git
 git_submodule: 1
diff --git a/rbm.conf b/rbm.conf
index ba4baa0..e0e2c7b 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,11 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '10.0.13'
+  torbrowser_version: '10.0.14'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
 - 10.0.12
+- 10.0.13
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1

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

[tor-commits] [tor-browser-build/maint-10.0-desktop] Bug 40249: Bump mingw-w64 and clang for Firefox 78.9

2021-03-18 Thread sysrqb

commit 3797da9b1363edeb6866b85e7685813edeef325c
Author: Nicolas Vigier 
Date:   Tue Mar 16 11:04:08 2021 +0100

Bug 40249: Bump mingw-w64 and clang for Firefox 78.9

https://hg.mozilla.org/releases/mozilla-esr78/rev/1b0e1f0d885e
https://hg.mozilla.org/releases/mozilla-esr78/rev/d726d74daa39
https://hg.mozilla.org/releases/mozilla-esr78/rev/cc840a008393
---
 projects/binutils/config  |   5 +
 projects/clang-source/build   |  10 +-
 projects/clang-source/config  |   9 +-
 projects/clang-source/no-seh.patch| 145 --
 projects/clang/build  |   2 +
 projects/clang/config |  14 +++
 projects/mingw-w64-clang/build|   4 +
 projects/mingw-w64-clang/config   |   3 +-
 projects/mingw-w64-clang/mingw-dwrite_3.patch |  84 +++
 projects/mingw-w64/config |   2 +-
 10 files changed, 122 insertions(+), 156 deletions(-)

diff --git a/projects/binutils/config b/projects/binutils/config
index 2367280..ad341ed 100644
--- a/projects/binutils/config
+++ b/projects/binutils/config
@@ -7,6 +7,11 @@ var:
 use_container: 1
 
 targets:
+  # We use the windows-clang target for the binutils we use for building
+  # clang during windows builds. See projects/clang/config.
+  windows-clang:
+var:
+  configure_opt: '--disable-multilib --enable-gold 
--enable-deterministic-archives --enable-plugins'
   windows:
 var:
   configure_opt: '--target=[% c("arch") %]-w64-mingw32 --disable-multilib 
--enable-deterministic-archives'
diff --git a/projects/clang-source/build b/projects/clang-source/build
index d94fcbe..227d614 100644
--- a/projects/clang-source/build
+++ b/projects/clang-source/build
@@ -10,22 +10,18 @@ tar -xf $rootdir/[% c('input_files_by_name/compiler-rt') %]
 tar -xf $rootdir/[% c('input_files_by_name/libunwind') %]
 
 mv llvm-[% c("version") %].src llvm
+[% IF ! c("var/windows") -%]
 # LLVM has reproducibility issues when optimizing bitcode, which we need to
 # patch. See: #32053 for more details.
 patch -p1 < $rootdir/43909.patch
+[% END -%]
 mv clang-[% c("version") %].src llvm/tools/clang
 # Having clang-tidy available seems like a good idea
 mv clang-tools-extra-[% c("version") %].src llvm/tools/clang/tools/extra
 mv libcxx-[% c("version") %].src llvm/projects/libcxx
 mv libcxxabi-[% c("version") %].src llvm/projects/libcxxabi
 mv lld-[% c("version") %].src llvm/tools/lld
-[% IF c("var/windows-i686") %]
-  # mingw-w64 does not support SEH on 32bit systems. Make it possible to
-  # explicitly disable it.
-  cd llvm/tools
-  patch -p1 < $rootdir/no-seh.patch
-  cd ../../
-[% END %]
+
 mv compiler-rt-[% c("version") %].src llvm/projects/compiler-rt
 # We need libunwind only for mingw-w64-clang, don't include it as tightly by
 # putting it into projects/
diff --git a/projects/clang-source/config b/projects/clang-source/config
index 8adb18e..a6dce85 100644
--- a/projects/clang-source/config
+++ b/projects/clang-source/config
@@ -4,6 +4,12 @@ filename: '[% project %]-[% c("version") %]-[% 
c("var/build_id") %].tar.gz'
 gpg_keyring: clang.gpg
 sig_ext: sig
 
+targets:
+  windows:
+# We use clang 11 for Windows builds:
+# https://hg.mozilla.org/releases/mozilla-esr78/rev/cc840a008393
+version: 11.0.1
+
 input_files:
   - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% 
c("version") %]/llvm-[% c("version") %].src.tar.xz'
 name: llvm
@@ -30,5 +36,4 @@ input_files:
 name: libunwind
 file_gpg_id: 1
   - filename: 43909.patch
-  - filename: no-seh.patch
-enable: '[% c("var/windows-i686") %]'
+enable: '[% ! c("var/windows") %]'
diff --git a/projects/clang-source/no-seh.patch 
b/projects/clang-source/no-seh.patch
deleted file mode 100644
index 1a52e40..000
--- a/projects/clang-source/no-seh.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From 38cbe873d45cf3c881ef4113b48193edfd418f43 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= 
-Date: Mon, 27 Jul 2020 23:44:41 +0300
-Subject: [PATCH] Implement the --no-seh flag
-
-Previously this flag was just ignored. If set, set the
-IMAGE_DLL_CHARACTERISTICS_NO_SEH bit, regardless of the normal safeSEH
-machinery.
-
-In mingw configurations, the safeSEH bit might not be set in e.g. object
-files built from handwritten assembly, making it impossible to use the
-normal safeseh flag. As mingw setups don't generally use SEH on 32 bit
-x86 at all, it should be fine to set that flag bit though - hook up
-the existing GNU ld flag for controlling that.
-
-Differential Revision: https://reviews.llvm.org/D84701
-
-diff --git a/lld/COFF/Config.h b/lld/COFF/Config.h
-index 4b62cd05f4f..17ea0f8bcab 100644
 a/lld/COFF/Config.h
-+++ b/lld/COFF/Config.h
-@@ -135,6 +135,7 @@ struct Configuration {
-   bool safeSEH = false;
-   Symbol *sehTable = nullptr;
-   Symbol *sehCount = nullptr;
-+  bool noSEH = false;
- 
-

[tor-commits] [tor/master] Fold new entries into 0.4.6.1-alpha ChangeLog

2021-03-18 Thread nickm

commit ded8f9b37882525f71a82e20a6b6c1b3ebb5d23e
Author: Nick Mathewson 
Date:   Thu Mar 18 09:51:37 2021 -0400

Fold new entries into 0.4.6.1-alpha ChangeLog
---
 ChangeLog| 17 +
 changes/bug40222 |  6 --
 changes/bug40285_045 |  4 
 changes/ticket40228  |  4 
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a9d8df1566..e4c0dc431e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,13 @@ Changes in version 0.4.6.1-alpha - 2021-03-18
   operator know why their relay hasn't been voted on. Closes ticket
   40255. Patch by Neel Chauhan.
 
+  o Major features (metrics):
+- Relays now report how overloaded they are in their extra-info
+  documents. This information is controlled with the
+  OverloadStatistics torrc option, and it will be used to improve
+  decisions about the network's load balancing. Implements proposal
+  328; closes ticket 40222.
+
   o Major features (relay, denial of service):
 - Add a new DoS subsystem feature to control the rate of client
   connections for relays. Closes ticket 40253.
@@ -81,6 +88,11 @@ Changes in version 0.4.6.1-alpha - 2021-03-18
 - Add the stream ID argument to the event line in the ADDRMAP
   control event. Closes ticket 40249. Patch by Neel Chauhan.
 
+  o Minor features (dormant mode):
+- Add a new 'DormantTimeoutEnabled' option to allow coarse-grained
+  control over whether the client ever becomes dormant from
+  inactivity. Most people won't need this. Closes ticket 40228.
+
   o Minor features (logging):
 - Change the DoS subsystem heartbeat line format so be more clear on
   what has been detected/rejected and which option is disabled if
@@ -120,6 +132,11 @@ Changes in version 0.4.6.1-alpha - 2021-03-18
   architectures in the future. Fixes bug 40274; bugfix
   on 0.2.5.1-alpha.
 
+  o Minor bugfixes (controller):
+- Fix a "BUG" warning that would appear when a controller chooses
+  the first hop for a circuit, and that circuit completes. Fixes bug
+  40285; bugfix on 0.3.2.1-alpha.
+
   o Minor bugfixes (directory authorities, voting):
 - Add a new consensus method (31) to support any future changes that
   authorities decide to make to the value of bwweightscale or
diff --git a/changes/bug40222 b/changes/bug40222
deleted file mode 100644
index 8338ea4a7b..00
--- a/changes/bug40222
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major features (metrics):
-- Introduce a new class of extra-info statistics that allows relays to
-  expose details of how overloaded they are. This information is controlled
-  using the OverloadStatistics torrc option, and it will be used to make
-  more informed decisions about the network's load balancing. Implements
-  proposal 328; closes ticket 40222.
diff --git a/changes/bug40285_045 b/changes/bug40285_045
deleted file mode 100644
index db4f73cde0..00
--- a/changes/bug40285_045
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (controller):
-- Fix a "BUG" warning that would appear when a controller chooses the
-  first hop for a circuit, and that circuit completes.  Fixes
-  bug 40285; bugfix on 0.3.2.1-alpha.
diff --git a/changes/ticket40228 b/changes/ticket40228
deleted file mode 100644
index 297204decd..00
--- a/changes/ticket40228
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (dormant mode):
-- Add a new 'DormantTimeoutEnabled' option to allow coarse-grained
-  control over whether the client ever becomes dormant from inactivity.
-  Most people won't need this. Closes ticket 40228.

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

[tor-commits] [tor/master] Fix compiler warning about signed/unsigned conversion.

2021-03-18 Thread nickm

commit 80da1761a624686e25223b64f5832eab9249568b
Author: George Kadianakis 
Date:   Wed Mar 17 20:03:39 2021 +0200

Fix compiler warning about signed/unsigned conversion.

```
src/feature/stats/rephist.c: In function âoverload_happened_recentlyâ:
src/feature/stats/rephist.c:215:21: error: comparison between signed and 
unsigned integer expressions [-Werror=sign-compare]
   if (overload_time > approx_time() - 3600 * n_hours) {
```
from https://gitlab.torproject.org/tpo/core/tor/-/issues/40341#note_2729364
---
 src/feature/stats/rephist.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/feature/stats/rephist.c b/src/feature/stats/rephist.c
index fb97e0d255..7c0c28804c 100644
--- a/src/feature/stats/rephist.c
+++ b/src/feature/stats/rephist.c
@@ -209,7 +209,7 @@ static overload_stats_t overload_stats;
 
 /** Return true if this overload happened within the last `n_hours`. */
 static bool
-overload_happened_recently(time_t overload_time, unsigned n_hours)
+overload_happened_recently(time_t overload_time, int n_hours)
 {
   /* An overload is relevant if it happened in the last 72 hours */
   if (overload_time > approx_time() - 3600 * n_hours) {

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

[tor-commits] [styleguide/master] Update README.md

2021-03-18 Thread hiro

commit 86d3fbdcf03838df9485f3134bdf80335028ba72
Author: ephemeralwaves 
Date:   Wed Mar 17 20:29:11 2021 +

Update README.md
---
 README.md | 51 +++
 1 file changed, 51 insertions(+)

diff --git a/README.md b/README.md
index 8b13789..dd039db 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,52 @@
+# Style Guide
 
+The Tor Styleguide is based on [Bootstrap](https://getbootstrap.com/), an 
open-source toolkit for developing with HTML, CSS, and JS. We are currently 
[implementing 
v4.0.0-beta.2](https://github.com/twbs/bootstrap/releases/tag/v4.0.0-beta.2). 
+
+You can also clone this repository and use our CSS or SASS files. SASS is a 
CSS extension language. Bootstrap and this styleguide are based on v3.5.4.
+
+If you want to use SASS you can download the complete archive for the 
styleguide. The scss folder under assets contains all the sass files. Since we 
use bootstrap, we only add a few styles without modifying bootstrap core or 
defining new elements whenever possible. These are _tor_variables.scss and 
_tor.scss. These are imported in the main bootstrap scss file and compiled into 
the final css.
+
+## About 
+
+Bootstrap contains a few JavaScript libraries for extra interaction with the 
DOM. We use these libraries but do not add extra JavaScript. You might notice 
that if you run Tor Browser with high security mode, JavaScript is disabled by 
default. This styleguide is designed to also work for users using Tor Browser 
in high security mode, so that only few elements are affected if you disable 
JavaScript.
+
+## Getting Started
+
+These instructions will get you a copy of the project up and running on your 
local machine. This styleguide has been built using 
[Lektor](https://www.getlektor.com/). Lektor is a static content management 
system. You can build this yourself by installing Lektor.
+
+
+### Prerequisites
+
+What things you need to install the software 
+- [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
+- [lektor](https://www.getlektor.com/docs/installation/)
+
+### Installing
+
+Get the code by running:
+```
+git clone [repo address]
+```
+
+You must run two commands to pull the submodule:
+
+```
+git submodule init 
+```
+then
+
+```
+git submodule update
+```
+
+
+### Run/Build With
+
+```
+lektor server
+```
+
+
+## Extras
+
+We also provide a minimal Lektor template website that you can start 
modifying. This is available at this 
[repository](https://gitweb.torproject.org/project/web/template.git/).

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

[tor-commits] [styleguide/master] Create README.md

2021-03-18 Thread hiro

commit c39aa2b8d1df217f313019b00a82e00addf08e98
Author: ephemeralwaves 
Date:   Wed Mar 17 15:51:45 2021 -0400

Create README.md
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
new file mode 100644
index 000..8b13789
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+



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

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

2021-03-18 Thread translation

commit 086a6be7c0e7e52ccb94fcf4bc503ad6439a04b5
Author: Translation commit bot 
Date:   Thu Mar 18 10:45:16 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml_completed
---
 tr/torbrowser_strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tr/torbrowser_strings.xml b/tr/torbrowser_strings.xml
index 9192341ee1..7963c7de54 100644
--- a/tr/torbrowser_strings.xml
+++ b/tr/torbrowser_strings.xml
@@ -75,5 +75,5 @@
 
 Maske kullanÄ±n, Tor kullanÄ±n.
 Ä°zleme salgÄ±nÄ±ndan 
korunun.
-Friends of Tor baÄÄ±ÅÄ±nÄ±z kadar 
katkÄ±da bulunacak.
+Friends of Tor, baÄÄ±ÅÄ±nÄ±z kadar 
katkÄ±da bulunacak.
 

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

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

2021-03-18 Thread translation

commit 75a88b97c88d73d0d94a962a75703f0c33f8087c
Author: Translation commit bot 
Date:   Thu Mar 18 10:45:13 2021 +


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

diff --git a/tr/torbrowser_strings.xml b/tr/torbrowser_strings.xml
index 9192341ee1..7963c7de54 100644
--- a/tr/torbrowser_strings.xml
+++ b/tr/torbrowser_strings.xml
@@ -75,5 +75,5 @@
 
 Maske kullanÄ±n, Tor kullanÄ±n.
 Ä°zleme salgÄ±nÄ±ndan 
korunun.
-Friends of Tor baÄÄ±ÅÄ±nÄ±z kadar 
katkÄ±da bulunacak.
+Friends of Tor, baÄÄ±ÅÄ±nÄ±z kadar 
katkÄ±da bulunacak.
 

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

[tor-commits] [sbws/master] fix: semi-automatic correction of typos

2021-03-18 Thread juga

commit 888fb6e88366e4bdaced0239d833ecee11fac636
Author: juga0 
Date:   Wed Mar 17 12:51:35 2021 +

fix: semi-automatic correction of typos

Closes #33599.
---
 docs/source/contributing.rst | 10 +-
 docs/source/examples/sbws.example.ini|  2 +-
 docs/source/generator.rst|  6 +++---
 docs/source/glossary.rst |  4 ++--
 docs/source/how_works.rst|  2 +-
 docs/source/implementation.rst   | 10 +-
 docs/source/man_sbws.rst |  2 +-
 docs/source/roadmap.rst  |  2 +-
 docs/source/testing.rst  |  2 +-
 sbws/core/generate.py|  2 +-
 sbws/core/scanner.py |  8 
 sbws/core/stats.py   |  2 +-
 sbws/globals.py  |  4 ++--
 sbws/lib/circuitbuilder.py   |  2 +-
 sbws/lib/destination.py  |  8 
 sbws/lib/relaylist.py|  2 +-
 sbws/lib/relayprioritizer.py |  4 ++--
 sbws/lib/resultdump.py   | 13 +++--
 sbws/lib/v3bwfile.py |  8 
 sbws/util/fs.py  |  6 +++---
 sbws/util/stem.py|  4 ++--
 tests/integration/chutney_data/client_bwscanner.tmpl |  2 +-
 tests/integration/run.sh |  2 +-
 tests/unit/core/test_generate.py |  4 ++--
 tests/unit/lib/test_destination.py   |  2 +-
 tests/unit/lib/test_relaylist.py |  2 +-
 tests/unit/lib/test_resultdump.py|  2 +-
 tests/unit/lib/test_v3bwfile.py  |  2 +-
 tests/unit/util/test_state.py|  2 +-
 29 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/docs/source/contributing.rst b/docs/source/contributing.rst
index c17aa4a..551ba7d 100644
--- a/docs/source/contributing.rst
+++ b/docs/source/contributing.rst
@@ -111,11 +111,11 @@ New features should add a corresponding documentation in 
/docs.
 An editor compatible with `EditorConfig `_ will
 help you to follow the general formatting code style.
 
-Timestamps must be in UTC. It is prefered to use ``datetime`` objects or
+Timestamps must be in UTC. It is preferred to use ``datetime`` objects or
 Unix timestamps. Timestamps read by the user should be always formatted in
 `ISO 8601 `_
 
-Functional style is prefered:
+Functional style is preferred:
 
 - use list comprenhensions lambda, map, reduce
 - avoid reasigigning variables, instead create new ones
@@ -148,7 +148,7 @@ and possibly the bugfix version.
 The commit message should contain ``Closes: #bugnumber``.
 
 From version 1.0.2 we started to prefix the summary with the subpackage or
-component, though we have not standarized the words to use, eg: ``scanner``,
+component, though we have not standardized the words to use, eg: ``scanner``,
 ``generate``, ``v3bwfile``, ``relaylist``, ``doc``, ``test``, ``CI``.
 
 From version 1.0.3, we also started to prefix the summary with ``new``,
@@ -156,7 +156,7 @@ From version 1.0.3, we also started to prefix the summary 
with ``new``,
 sections in the CHANGELOG.
 
 From version 1.1.0 we started to use the words ``new``, ``chg`` and ``fix``,
-not in the sense `gitchangelog`_ use them, but to match sematic versioning
+not in the sense `gitchangelog`_ use them, but to match semantic versioning
 changes major, minor and patch.
 
 Try to make each commit a logically separate changes.::
@@ -313,7 +313,7 @@ Example commit message
   between, but conventions vary here
 
 
-.. rubric:: External eferences
+.. rubric:: External references
 
 .. [DIST] 
https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project
 .. [MERG] https://www.atlassian.com/git/tutorials/merging-vs-rebasing
diff --git a/docs/source/examples/sbws.example.ini 
b/docs/source/examples/sbws.example.ini
index 1a2d6a4..657da48 100644
--- a/docs/source/examples/sbws.example.ini
+++ b/docs/source/examples/sbws.example.ini
@@ -30,7 +30,7 @@ country = ZZ
 max_num_failures = 3
 
 ## The following logging options are set by default.
-## There is no need to change them unless other options are prefered.
+## There is no need to change them unless other options are preferred.
 ; [logging]
 ; # Whether or not to log to a rotating file the directory paths.log_dname
 ; to_file = yes
diff --git a/docs/source/generator.rst b/docs/source/generator.rst
index 7d43d33..986be0c 100644
--- a/docs/source/generator.rst
+++ b/docs/source/generator.rst
@@ -23,15 +23,15 @@ Each relay bandwidth measurements are selected in the 
following

[tor-commits] [sbws/master] Merge branch 'maint-1.1'

2021-03-18 Thread juga

commit a016ab4fb9d677999d2a376dcfb998b942a1acc3
Merge: fd139b8 888fb6e
Author: juga0 
Date:   Thu Mar 18 08:11:25 2021 +

Merge branch 'maint-1.1'

 .coveragerc|   1 +
 .editorconfig  |  10 +-
 .gitattributes |   1 +
 .gitlab-ci.yml |   7 +-
 MANIFEST.in|   8 +-
 docs/source/contributing.rst   |  10 +-
 docs/source/examples/sbws.example.ini  |   2 +-
 docs/source/generator.rst  |   6 +-
 docs/source/glossary.rst   |   4 +-
 docs/source/how_works.rst  |   2 +-
 docs/source/implementation.rst |  10 +-
 docs/source/man_sbws.rst   |   2 +-
 docs/source/roadmap.rst|   2 +-
 docs/source/testing.rst|   2 +-
 pyproject.toml |  24 +
 sbws/__init__.py   |  10 +-
 sbws/_version.py   | 189 +++--
 sbws/core/cleanup.py   | 121 +--
 sbws/core/generate.py  | 234 +++---
 sbws/core/scanner.py   | 544 +-
 sbws/core/stats.py | 154 ++--
 sbws/globals.py|  90 +--
 sbws/lib/bwfile_health.py  |  17 +-
 sbws/lib/circuitbuilder.py |  53 +-
 sbws/lib/destination.py| 265 ---
 sbws/lib/heartbeat.py  |  18 +-
 sbws/lib/relaylist.py  | 172 +++--
 sbws/lib/relayprioritizer.py   |  64 +-
 sbws/lib/resultdump.py | 586 +--
 sbws/lib/scaling.py|   3 +-
 sbws/lib/v3bwfile.py   | 816 -
 sbws/sbws.py   |  65 +-
 sbws/util/config.py| 551 --
 sbws/util/filelock.py  |  30 +-
 sbws/util/fs.py|  86 ++-
 sbws/util/iso3166.py   | 273 ++-
 sbws/util/json.py  |   2 +-
 sbws/util/parser.py|  32 +-
 sbws/util/requests.py  |  17 +-
 sbws/util/state.py |   9 +-
 sbws/util/stem.py  | 171 +++--
 sbws/util/timestamps.py|   2 +-
 sbws/util/userquery.py |  25 +-
 setup.cfg  |  97 ++-
 setup.py   |  86 +--
 tests/conftest.py  |  19 +-
 .../integration/chutney_data/client_bwscanner.tmpl |   2 +-
 tests/integration/conftest.py  |  52 +-
 tests/integration/core/test_scanner.py |  46 +-
 tests/integration/lib/test_destination.py  |  72 +-
 tests/integration/lib/test_relaylist.py|  13 +-
 tests/integration/lib/test_relayprioritizer.py |  57 +-
 tests/integration/run.sh   |   5 +-
 tests/integration/util/test_requests.py|  15 +-
 tests/integration/util/test_stem.py|   8 +-
 tests/unit/conftest.py | 208 +++---
 tests/unit/core/test_generate.py   |  22 +-
 tests/unit/core/test_stats.py  |  55 +-
 tests/unit/lib/test_destination.py |   4 +-
 tests/unit/lib/test_heartbeat.py   |   9 +-
 tests/unit/lib/test_relaylist.py   |   6 +-
 tests/unit/lib/test_resultdump.py  |  47 +-
 tests/unit/lib/test_results.py | 235 +++---
 tests/unit/lib/test_scaling.py |  25 +-
 tests/unit/lib/test_v3bwfile.py| 506 +++--
 tests/unit/test_bwfile_health.py   |  12 +-
 tests/unit/util/test_config.py | 325 
 tests/unit/util/test_state.py  |  69 +-
 tests/unit/util/test_stem.py   |  15 +-
 tests/unit/util/test_timestamp.py  |  24 +-
 tests/unit/util/test_timestamps.py |   5 +-
 tests/unit/util/test_userquery.py  |  83 ++-
 tox.ini| 106 ++-
 versioneer.py  | 169 +++--
 74 files changed, 4299 insertions(+), 2788 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org

[tor-commits] [sbws/master] fix: tests: Additional security tests

2021-03-18 Thread juga

commit 41fa1480da0466ec859871ba8a7710f4950cd8f0
Author: juga0 
Date:   Wed Mar 17 09:51:04 2021 +

fix: tests: Additional security tests
---
 tox.ini | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/tox.ini b/tox.ini
index 5c6e2a2..3a4fb27 100644
--- a/tox.ini
+++ b/tox.ini
@@ -94,3 +94,14 @@ whitelist_externals = make
 changedir = docs
 commands =
 make linkcheck
+
+; Not included in the envlist, useful to run sometimes.
+[testenv:bandit]
+deps = bandit
+;  --skip B101  ; B101: assert_used
+commands = bandit -r --exclude sbws/_version.py sbws/ test
+
+; Requires Internet
+[testenv:safety]
+deps = safety
+commands = safety check



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

[tor-commits] [sbws/master] fix: tests: Add codespell configuration

2021-03-18 Thread juga

commit f6b40b7fa22c4f3574ad297b64f7f13b3b938a7d
Author: juga0 
Date:   Wed Mar 17 12:44:25 2021 +

fix: tests: Add codespell configuration
---
 setup.cfg | 4 
 tox.ini   | 7 +++
 2 files changed, 11 insertions(+)

diff --git a/setup.cfg b/setup.cfg
index 578a389..2ba9548 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -40,6 +40,7 @@ install_requires =
 [options.extras_require]
 test =
   black
+  codespell
   coverage
   flake8
   flake8-docstrings
@@ -78,6 +79,9 @@ max-line-length = 79
 extend-ignore = E203, W503, D1, D2, D4
 exclude = docs/*,sbws/_version.py,sbws/__init__.py,versioneer.py
 
+[codespell]
+skip = 
versioneer.py,sbws/_version.py,sbws/util/iso3166.py,tests/data,*.puml,*.svg,docs/build,docs/source/proposals,docs/source/torflow_aggr.rst
+
 [coverage:run]
 # Do not give error on empty __init__ files
 omit = */__init__.py
diff --git a/tox.ini b/tox.ini
index 3a4fb27..87d0828 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,6 +7,7 @@ envlist =
 black,
 isort,
 flake8,
+codespell,
 doc,
 stats
 
@@ -62,6 +63,12 @@ deps = flake8-docstrings
 commands =
   flake8 sbws tests
 
+[testenv:codespell]
+skip_install = True
+deps = codespell
+commands =
+  codespell sbws tests docs
+
 [testenv:clean]
 skip_install = True
 deps = coverage



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

[tor-commits] [sbws/master] fix: 2nd round of automatic format

2021-03-18 Thread juga

commit d6de5a4b2a91e06e1c8b506ec28d227dec662567
Author: juga0 
Date:   Wed Mar 17 09:21:42 2021 +

fix: 2nd round of automatic format

black insists to keep one long line and flake complain, therefore make
flake to ignore it.
---
 sbws/lib/resultdump.py | 12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/sbws/lib/resultdump.py b/sbws/lib/resultdump.py
index 4c22209..e60f3bc 100644
--- a/sbws/lib/resultdump.py
+++ b/sbws/lib/resultdump.py
@@ -400,8 +400,7 @@ class Result:
 "scanner": self.scanner,
 "version": self.version,
 "relay_in_recent_consensus": self.relay_in_recent_consensus,
-"relay_recent_measurement_attempt":
-self.relay_recent_measurement_attempt,
+"relay_recent_measurement_attempt": 
self.relay_recent_measurement_attempt,  # noqa
 "relay_recent_priority_list": self.relay_recent_priority_list,
 }
 
@@ -507,11 +506,7 @@ class ResultError(Result):
 
 def to_dict(self):
 d = super().to_dict()
-d.update(
-{
-"msg": self.msg,
-}
-)
+d.update({"msg": self.msg})
 return d
 
 
@@ -831,8 +826,7 @@ class ResultSuccess(Result):
 "relay_burst_bandwidth": self.relay_burst_bandwidth,
 "relay_observed_bandwidth": self.relay_observed_bandwidth,
 "consensus_bandwidth": self.consensus_bandwidth,
-"consensus_bandwidth_is_unmeasured":
-self.consensus_bandwidth_is_unmeasured,
+"consensus_bandwidth_is_unmeasured": 
self.consensus_bandwidth_is_unmeasured,  # noqa
 }
 )
 return d



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

[tor-commits] [sbws/master] fix: CI: Use all tox environments for python 3.8

2021-03-18 Thread juga

commit c662522e355437f96158f5402b30ea3f0c797bac
Author: juga0 
Date:   Wed Mar 17 09:25:12 2021 +

fix: CI: Use all tox environments for python 3.8

Closes: #40070
---
 .gitlab-ci.yml | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 098781f..da457b3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -113,12 +113,7 @@ python38:
 - apt install -yqq dvipng
   image: $BASE_IMAGE
   script:
-  - tox -e inst
-  - tox -e setup
-  - tox -e py38
-  - tox -e integration
-  - tox -e lint
-  - tox -e doc
+  - tox
 
 python39:
   variables:



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

[tor-commits] [sbws/master] fix: flake8 errors

2021-03-18 Thread juga

commit 8f711dd176c750f09637877b291f3d25e507a7c8
Author: juga0 
Date:   Tue Mar 16 19:14:13 2021 +

fix: flake8 errors
---
 sbws/lib/destination.py | 4 ++--
 sbws/lib/resultdump.py  | 6 --
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sbws/lib/destination.py b/sbws/lib/destination.py
index 28951a9..ae1e695 100644
--- a/sbws/lib/destination.py
+++ b/sbws/lib/destination.py
@@ -403,8 +403,8 @@ class DestinationList:
 dests.append(
 Destination.from_config(
 conf[dest_sec],
-# Multiply by the number of threads since all the threads 
will
-# fail at the same time.
+# Multiply by the number of threads since all the threads
+# will fail at the same time.
 conf.getint("scanner", "max_download_size"),
 conf.getint("scanner", "measurement_threads"),
 )
diff --git a/sbws/lib/resultdump.py b/sbws/lib/resultdump.py
index 5ef45de..4c22209 100644
--- a/sbws/lib/resultdump.py
+++ b/sbws/lib/resultdump.py
@@ -400,7 +400,8 @@ class Result:
 "scanner": self.scanner,
 "version": self.version,
 "relay_in_recent_consensus": self.relay_in_recent_consensus,
-"relay_recent_measurement_attempt": 
self.relay_recent_measurement_attempt,
+"relay_recent_measurement_attempt":
+self.relay_recent_measurement_attempt,
 "relay_recent_priority_list": self.relay_recent_priority_list,
 }
 
@@ -830,7 +831,8 @@ class ResultSuccess(Result):
 "relay_burst_bandwidth": self.relay_burst_bandwidth,
 "relay_observed_bandwidth": self.relay_observed_bandwidth,
 "consensus_bandwidth": self.consensus_bandwidth,
-"consensus_bandwidth_is_unmeasured": 
self.consensus_bandwidth_is_unmeasured,
+"consensus_bandwidth_is_unmeasured":
+self.consensus_bandwidth_is_unmeasured,
 }
 )
 return d



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

[tor-commits] [sbws/master] fix: Reorder imports with isort

2021-03-18 Thread juga

commit 68cb95ba1a74a50791714c0ceb1993a831b19ac2
Author: juga0 
Date:   Tue Mar 16 19:10:34 2021 +

fix: Reorder imports with isort
---
 sbws/core/cleanup.py   | 17 +
 sbws/core/generate.py  | 22 ++--
 sbws/core/scanner.py   | 50 +-
 sbws/core/stats.py | 24 +++--
 sbws/globals.py|  7 ++--
 sbws/lib/bwfile_health.py  | 13 +++
 sbws/lib/circuitbuilder.py | 12 +--
 sbws/lib/destination.py| 13 +++
 sbws/lib/heartbeat.py  |  1 -
 sbws/lib/relaylist.py  | 10 +++---
 sbws/lib/relayprioritizer.py   |  9 +++--
 sbws/lib/resultdump.py | 21 ++-
 sbws/lib/v3bwfile.py   | 21 +--
 sbws/sbws.py   | 18 +-
 sbws/util/config.py| 15 
 sbws/util/filelock.py  |  3 +-
 sbws/util/json.py  |  2 +-
 sbws/util/parser.py|  8 ++---
 sbws/util/state.py |  5 +--
 sbws/util/stem.py  | 38 ++--
 sbws/util/timestamps.py|  2 +-
 tests/conftest.py  |  6 ++--
 tests/integration/conftest.py  |  3 +-
 tests/integration/core/test_scanner.py |  3 +-
 tests/integration/lib/test_destination.py  |  2 +-
 tests/integration/lib/test_relayprioritizer.py |  5 ++-
 tests/integration/util/test_requests.py|  3 +-
 tests/unit/conftest.py | 14 +---
 tests/unit/core/test_generate.py   |  2 +-
 tests/unit/core/test_stats.py  |  4 +--
 tests/unit/lib/test_heartbeat.py   |  1 +
 tests/unit/lib/test_resultdump.py  |  2 +-
 tests/unit/lib/test_results.py | 20 ++-
 tests/unit/lib/test_scaling.py |  2 +-
 tests/unit/lib/test_v3bwfile.py| 23 ++--
 tests/unit/util/test_config.py |  3 +-
 tests/unit/util/test_state.py  |  3 +-
 tests/unit/util/test_timestamp.py  |  6 ++--
 tests/unit/util/test_timestamps.py |  5 +--
 tests/unit/util/test_userquery.py  |  1 +
 40 files changed, 215 insertions(+), 204 deletions(-)

diff --git a/sbws/core/cleanup.py b/sbws/core/cleanup.py
index 8b7e6fd..dd43f9c 100644
--- a/sbws/core/cleanup.py
+++ b/sbws/core/cleanup.py
@@ -1,17 +1,16 @@
 """Util functions to cleanup disk space."""
+import gzip
+import logging
+import os
+import shutil
+import time
 import types
+from argparse import ArgumentDefaultsHelpFormatter
+from datetime import datetime, timedelta
 
-from sbws.util.filelock import DirectoryLock
 from sbws.globals import fail_hard
+from sbws.util.filelock import DirectoryLock
 from sbws.util.timestamp import unixts_to_dt_obj
-from argparse import ArgumentDefaultsHelpFormatter
-from datetime import datetime
-from datetime import timedelta
-import os
-import gzip
-import shutil
-import logging
-import time
 
 log = logging.getLogger(__name__)
 
diff --git a/sbws/core/generate.py b/sbws/core/generate.py
index 55bf719..ecc0b53 100644
--- a/sbws/core/generate.py
+++ b/sbws/core/generate.py
@@ -1,23 +1,23 @@
+import logging
+import os
+from argparse import ArgumentDefaultsHelpFormatter
 from math import ceil
 
 from sbws.globals import (
-fail_hard,
+DAY_SECS,
+GENERATE_PERIOD,
+NUM_MIN_RESULTS,
+PROP276_ROUND_DIG,
 SBWS_SCALE_CONSTANT,
-TORFLOW_SCALING,
 SBWS_SCALING,
 TORFLOW_BW_MARGIN,
-PROP276_ROUND_DIG,
-DAY_SECS,
-NUM_MIN_RESULTS,
-GENERATE_PERIOD,
+TORFLOW_SCALING,
+fail_hard,
 )
-from sbws.lib.v3bwfile import V3BWFile
+from sbws.lib import destination
 from sbws.lib.resultdump import load_recent_results_in_datadir
-from argparse import ArgumentDefaultsHelpFormatter
-import os
-import logging
+from sbws.lib.v3bwfile import V3BWFile
 from sbws.util.timestamp import now_fname
-from sbws.lib import destination
 
 log = logging.getLogger(__name__)
 
diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py
index ab5a99a..38ddef2 100644
--- a/sbws/core/scanner.py
+++ b/sbws/core/scanner.py
@@ -1,44 +1,42 @@
 """ Measure the relays. """
+import logging
+import os
 import queue
-
+import random
 import signal
 import sys
 import threading
+import time
 import traceback
 import uuid
-
+from argparse import ArgumentDefaultsHelpFormatter
 from multiprocessing.context import TimeoutError
+from multiprocessing.dummy import Pool
+
+import sbws.util.requests as requests_utils
+import sbws.util.stem as stem_utils
+from sbws.globals import HTTP_GET_HEADERS, TIMEOUT_MEASUREMENTS,

[tor-commits] [sbws/master] fix: Move to declarative setup.cfg

2021-03-18 Thread juga

commit 7d26503cb32668c107bef3bae8389170c8ded14b
Author: juga0 
Date:   Tue Mar 16 14:28:09 2021 +

fix: Move to declarative setup.cfg

Also:
- Update versioneer
- And include other source distribution files in MANIFEST.in
- Add project URLs
- Add formatter and linter dependencies and configurations.
- tox: Remove travis, fix python environments
- tox: Remove extra coverage options and add them in .coveragerc.
---
 .coveragerc  |   1 +
 .gitattributes   |   1 +
 MANIFEST.in  |   8 +--
 pyproject.toml   |  24 +++
 sbws/_version.py |  25 ---
 setup.cfg|  93 --
 setup.py |  86 ++--
 tests/integration/run.sh |   3 +-
 tox.ini  |  88 +---
 versioneer.py| 169 ---
 10 files changed, 289 insertions(+), 209 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index c6303ca..ed599ae 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,2 +1,3 @@
 [run]
 omit = */__init__.py
+source = sbws
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000..cc47975
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+sbws/_version.py export-subst
diff --git a/MANIFEST.in b/MANIFEST.in
index 793621e..a5058d4 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,8 +1,8 @@
 include *.md
 include *.rst
-include *.ini
-recursive-include docs *
-prune docs/build
+recursive-include docs Makefile make.bat
+recursive-include sbws *.ini
 recursive-include tests *
 recursive-exclude **/__pycache__ *
-include versioneer.py
+recursive-exclude * *.py[co]
+prune docs/build
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 000..f790796
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,24 @@
+
+[tool.black]
+line-length = 79
+target-version = ['py36', 'py37', 'py38']
+exclude = '''
+/(
+  docs
+  | .*__init__\.py
+  | .*_version\.py
+)/
+'''
+
+
+[tool.isort]
+line_length = 79
+# Compatibility with black
+# profile = black  # does not seem to work
+multi_line_output = 3
+include_trailing_comma = true
+force_grid_wrap = 0
+use_parentheses = true
+ensure_newline_before_comments = true
+src_paths = "sbws,tests"
+skip = "versioneer.py,docs,sbws/_version.py,sbws/__init__.py"
diff --git a/sbws/_version.py b/sbws/_version.py
index e1de1ad..cbf260a 100644
--- a/sbws/_version.py
+++ b/sbws/_version.py
@@ -6,7 +6,7 @@
 # that just contains the computed version number.
 
 # This file is released into the public domain. Generated by
-# versioneer-0.18 (https://github.com/warner/python-versioneer)
+# versioneer-0.19 (https://github.com/python-versioneer/python-versioneer)
 
 """Git implementation of _version.py."""
 
@@ -57,7 +57,7 @@ HANDLERS = {}
 
 
 def register_vcs_handler(vcs, method):  # decorator
-"""Decorator to mark a method as the handler for a particular VCS."""
+"""Create decorator to mark a method as the handler of a VCS."""
 def decorate(f):
 """Store f in HANDLERS[vcs][method]."""
 if vcs not in HANDLERS:
@@ -93,9 +93,7 @@ def run_command(commands, args, cwd=None, verbose=False, 
hide_stderr=False,
 if verbose:
 print("unable to find command, tried %s" % (commands,))
 return None, None
-stdout = p.communicate()[0].strip()
-if sys.version_info[0] >= 3:
-stdout = stdout.decode()
+stdout = p.communicate()[0].strip().decode()
 if p.returncode != 0:
 if verbose:
 print("unable to run %s (error)" % dispcmd)
@@ -165,6 +163,10 @@ def git_versions_from_keywords(keywords, tag_prefix, 
verbose):
 raise NotThisMethod("no keywords at all, weird")
 date = keywords.get("date")
 if date is not None:
+# Use only the last line.  Previous lines may contain GPG signature
+# information.
+date = date.splitlines()[-1]
+
 # git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant
 # datestamp. However we prefer "%ci" (which expands to an "ISO-8601
 # -like" string, which we must then edit to make compliant), because
@@ -300,6 +302,9 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, 
run_command=run_command):
 # commit date: see ISO-8601 comment in git_versions_from_keywords()
 date = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"],
cwd=root)[0].strip()
+# Use only the last line.  Previous lines may contain GPG signature
+# information.
+date = date.splitlines()[-1]
 pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1)
 
 return pieces
@@ -338,18 +343,18 @@ def render_pep440(pieces):
 
 
 def render_pep440_pre(pieces):
-"""TAG[.post.devDISTANCE] -- No -dirty.
+"""TAG[.post0.devDISTANCE] -- No -dirty.
 
 Exceptions:
-1: no tags. 0.post.devDISTANCE
+1: no tags. 0.post0.devDISTANCE
 """
 if

[tor-commits] [sbws/master] fix: Indent by default to 2 except python files

2021-03-18 Thread juga

commit de2154d4f1dc585366cc1b96ab49bc3def83b391
Author: juga0 
Date:   Tue Mar 16 14:23:14 2021 +

fix: Indent by default to 2 except python files

also uncomment final newline. Can be commented again in case it fails
---
 .editorconfig | 10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 696cda3..8629854 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,21 +7,15 @@ root = true
 
 [*]
 indent_style = space
-# this remove EOF new line with some editors
-# insert_final_newline = true
+insert_final_newline = true
 trim_trailing_whitespace = true
 end_of_line = lf
 charset = utf-8
 max_line_length = 79
+indent_size = 2
 
 [*.py]
 indent_size = 4
 
 [Makefile]
 indent_style = tab
-
-[*.ini]
-indent_size = 4
-
-[*.yml]
-indent_size = 2



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

[tor-commits] [sbws/maint-1.1] fix: 2nd round of automatic format

2021-03-18 Thread juga

commit d6de5a4b2a91e06e1c8b506ec28d227dec662567
Author: juga0 
Date:   Wed Mar 17 09:21:42 2021 +

fix: 2nd round of automatic format

black insists to keep one long line and flake complain, therefore make
flake to ignore it.
---
 sbws/lib/resultdump.py | 12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/sbws/lib/resultdump.py b/sbws/lib/resultdump.py
index 4c22209..e60f3bc 100644
--- a/sbws/lib/resultdump.py
+++ b/sbws/lib/resultdump.py
@@ -400,8 +400,7 @@ class Result:
 "scanner": self.scanner,
 "version": self.version,
 "relay_in_recent_consensus": self.relay_in_recent_consensus,
-"relay_recent_measurement_attempt":
-self.relay_recent_measurement_attempt,
+"relay_recent_measurement_attempt": 
self.relay_recent_measurement_attempt,  # noqa
 "relay_recent_priority_list": self.relay_recent_priority_list,
 }
 
@@ -507,11 +506,7 @@ class ResultError(Result):
 
 def to_dict(self):
 d = super().to_dict()
-d.update(
-{
-"msg": self.msg,
-}
-)
+d.update({"msg": self.msg})
 return d
 
 
@@ -831,8 +826,7 @@ class ResultSuccess(Result):
 "relay_burst_bandwidth": self.relay_burst_bandwidth,
 "relay_observed_bandwidth": self.relay_observed_bandwidth,
 "consensus_bandwidth": self.consensus_bandwidth,
-"consensus_bandwidth_is_unmeasured":
-self.consensus_bandwidth_is_unmeasured,
+"consensus_bandwidth_is_unmeasured": 
self.consensus_bandwidth_is_unmeasured,  # noqa
 }
 )
 return d



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

[tor-commits] [sbws/maint-1.1] fix: semi-automatic correction of typos

2021-03-18 Thread juga

commit 888fb6e88366e4bdaced0239d833ecee11fac636
Author: juga0 
Date:   Wed Mar 17 12:51:35 2021 +

fix: semi-automatic correction of typos

Closes #33599.
---
 docs/source/contributing.rst | 10 +-
 docs/source/examples/sbws.example.ini|  2 +-
 docs/source/generator.rst|  6 +++---
 docs/source/glossary.rst |  4 ++--
 docs/source/how_works.rst|  2 +-
 docs/source/implementation.rst   | 10 +-
 docs/source/man_sbws.rst |  2 +-
 docs/source/roadmap.rst  |  2 +-
 docs/source/testing.rst  |  2 +-
 sbws/core/generate.py|  2 +-
 sbws/core/scanner.py |  8 
 sbws/core/stats.py   |  2 +-
 sbws/globals.py  |  4 ++--
 sbws/lib/circuitbuilder.py   |  2 +-
 sbws/lib/destination.py  |  8 
 sbws/lib/relaylist.py|  2 +-
 sbws/lib/relayprioritizer.py |  4 ++--
 sbws/lib/resultdump.py   | 13 +++--
 sbws/lib/v3bwfile.py |  8 
 sbws/util/fs.py  |  6 +++---
 sbws/util/stem.py|  4 ++--
 tests/integration/chutney_data/client_bwscanner.tmpl |  2 +-
 tests/integration/run.sh |  2 +-
 tests/unit/core/test_generate.py |  4 ++--
 tests/unit/lib/test_destination.py   |  2 +-
 tests/unit/lib/test_relaylist.py |  2 +-
 tests/unit/lib/test_resultdump.py|  2 +-
 tests/unit/lib/test_v3bwfile.py  |  2 +-
 tests/unit/util/test_state.py|  2 +-
 29 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/docs/source/contributing.rst b/docs/source/contributing.rst
index c17aa4a..551ba7d 100644
--- a/docs/source/contributing.rst
+++ b/docs/source/contributing.rst
@@ -111,11 +111,11 @@ New features should add a corresponding documentation in 
/docs.
 An editor compatible with `EditorConfig `_ will
 help you to follow the general formatting code style.
 
-Timestamps must be in UTC. It is prefered to use ``datetime`` objects or
+Timestamps must be in UTC. It is preferred to use ``datetime`` objects or
 Unix timestamps. Timestamps read by the user should be always formatted in
 `ISO 8601 `_
 
-Functional style is prefered:
+Functional style is preferred:
 
 - use list comprenhensions lambda, map, reduce
 - avoid reasigigning variables, instead create new ones
@@ -148,7 +148,7 @@ and possibly the bugfix version.
 The commit message should contain ``Closes: #bugnumber``.
 
 From version 1.0.2 we started to prefix the summary with the subpackage or
-component, though we have not standarized the words to use, eg: ``scanner``,
+component, though we have not standardized the words to use, eg: ``scanner``,
 ``generate``, ``v3bwfile``, ``relaylist``, ``doc``, ``test``, ``CI``.
 
 From version 1.0.3, we also started to prefix the summary with ``new``,
@@ -156,7 +156,7 @@ From version 1.0.3, we also started to prefix the summary 
with ``new``,
 sections in the CHANGELOG.
 
 From version 1.1.0 we started to use the words ``new``, ``chg`` and ``fix``,
-not in the sense `gitchangelog`_ use them, but to match sematic versioning
+not in the sense `gitchangelog`_ use them, but to match semantic versioning
 changes major, minor and patch.
 
 Try to make each commit a logically separate changes.::
@@ -313,7 +313,7 @@ Example commit message
   between, but conventions vary here
 
 
-.. rubric:: External eferences
+.. rubric:: External references
 
 .. [DIST] 
https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project
 .. [MERG] https://www.atlassian.com/git/tutorials/merging-vs-rebasing
diff --git a/docs/source/examples/sbws.example.ini 
b/docs/source/examples/sbws.example.ini
index 1a2d6a4..657da48 100644
--- a/docs/source/examples/sbws.example.ini
+++ b/docs/source/examples/sbws.example.ini
@@ -30,7 +30,7 @@ country = ZZ
 max_num_failures = 3
 
 ## The following logging options are set by default.
-## There is no need to change them unless other options are prefered.
+## There is no need to change them unless other options are preferred.
 ; [logging]
 ; # Whether or not to log to a rotating file the directory paths.log_dname
 ; to_file = yes
diff --git a/docs/source/generator.rst b/docs/source/generator.rst
index 7d43d33..986be0c 100644
--- a/docs/source/generator.rst
+++ b/docs/source/generator.rst
@@ -23,15 +23,15 @@ Each relay bandwidth measurements are selected in the 
following

[tor-commits] [sbws/maint-1.1] fix: CI: Use all tox environments for python 3.8

2021-03-18 Thread juga

commit c662522e355437f96158f5402b30ea3f0c797bac
Author: juga0 
Date:   Wed Mar 17 09:25:12 2021 +

fix: CI: Use all tox environments for python 3.8

Closes: #40070
---
 .gitlab-ci.yml | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 098781f..da457b3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -113,12 +113,7 @@ python38:
 - apt install -yqq dvipng
   image: $BASE_IMAGE
   script:
-  - tox -e inst
-  - tox -e setup
-  - tox -e py38
-  - tox -e integration
-  - tox -e lint
-  - tox -e doc
+  - tox
 
 python39:
   variables:



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

[tor-commits] [sbws/maint-1.1] fix: tests: Additional security tests

2021-03-18 Thread juga

commit 41fa1480da0466ec859871ba8a7710f4950cd8f0
Author: juga0 
Date:   Wed Mar 17 09:51:04 2021 +

fix: tests: Additional security tests
---
 tox.ini | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/tox.ini b/tox.ini
index 5c6e2a2..3a4fb27 100644
--- a/tox.ini
+++ b/tox.ini
@@ -94,3 +94,14 @@ whitelist_externals = make
 changedir = docs
 commands =
 make linkcheck
+
+; Not included in the envlist, useful to run sometimes.
+[testenv:bandit]
+deps = bandit
+;  --skip B101  ; B101: assert_used
+commands = bandit -r --exclude sbws/_version.py sbws/ test
+
+; Requires Internet
+[testenv:safety]
+deps = safety
+commands = safety check



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

[tor-commits] [sbws/maint-1.1] fix: tests: Add codespell configuration

2021-03-18 Thread juga

commit f6b40b7fa22c4f3574ad297b64f7f13b3b938a7d
Author: juga0 
Date:   Wed Mar 17 12:44:25 2021 +

fix: tests: Add codespell configuration
---
 setup.cfg | 4 
 tox.ini   | 7 +++
 2 files changed, 11 insertions(+)

diff --git a/setup.cfg b/setup.cfg
index 578a389..2ba9548 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -40,6 +40,7 @@ install_requires =
 [options.extras_require]
 test =
   black
+  codespell
   coverage
   flake8
   flake8-docstrings
@@ -78,6 +79,9 @@ max-line-length = 79
 extend-ignore = E203, W503, D1, D2, D4
 exclude = docs/*,sbws/_version.py,sbws/__init__.py,versioneer.py
 
+[codespell]
+skip = 
versioneer.py,sbws/_version.py,sbws/util/iso3166.py,tests/data,*.puml,*.svg,docs/build,docs/source/proposals,docs/source/torflow_aggr.rst
+
 [coverage:run]
 # Do not give error on empty __init__ files
 omit = */__init__.py
diff --git a/tox.ini b/tox.ini
index 3a4fb27..87d0828 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,6 +7,7 @@ envlist =
 black,
 isort,
 flake8,
+codespell,
 doc,
 stats
 
@@ -62,6 +63,12 @@ deps = flake8-docstrings
 commands =
   flake8 sbws tests
 
+[testenv:codespell]
+skip_install = True
+deps = codespell
+commands =
+  codespell sbws tests docs
+
 [testenv:clean]
 skip_install = True
 deps = coverage



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

[tor-commits] [sbws/maint-1.1] fix: Indent by default to 2 except python files

2021-03-18 Thread juga

commit de2154d4f1dc585366cc1b96ab49bc3def83b391
Author: juga0 
Date:   Tue Mar 16 14:23:14 2021 +

fix: Indent by default to 2 except python files

also uncomment final newline. Can be commented again in case it fails
---
 .editorconfig | 10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 696cda3..8629854 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,21 +7,15 @@ root = true
 
 [*]
 indent_style = space
-# this remove EOF new line with some editors
-# insert_final_newline = true
+insert_final_newline = true
 trim_trailing_whitespace = true
 end_of_line = lf
 charset = utf-8
 max_line_length = 79
+indent_size = 2
 
 [*.py]
 indent_size = 4
 
 [Makefile]
 indent_style = tab
-
-[*.ini]
-indent_size = 4
-
-[*.yml]
-indent_size = 2



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

[tor-commits] [sbws/maint-1.1] fix: flake8 errors

2021-03-18 Thread juga

commit 8f711dd176c750f09637877b291f3d25e507a7c8
Author: juga0 
Date:   Tue Mar 16 19:14:13 2021 +

fix: flake8 errors
---
 sbws/lib/destination.py | 4 ++--
 sbws/lib/resultdump.py  | 6 --
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sbws/lib/destination.py b/sbws/lib/destination.py
index 28951a9..ae1e695 100644
--- a/sbws/lib/destination.py
+++ b/sbws/lib/destination.py
@@ -403,8 +403,8 @@ class DestinationList:
 dests.append(
 Destination.from_config(
 conf[dest_sec],
-# Multiply by the number of threads since all the threads 
will
-# fail at the same time.
+# Multiply by the number of threads since all the threads
+# will fail at the same time.
 conf.getint("scanner", "max_download_size"),
 conf.getint("scanner", "measurement_threads"),
 )
diff --git a/sbws/lib/resultdump.py b/sbws/lib/resultdump.py
index 5ef45de..4c22209 100644
--- a/sbws/lib/resultdump.py
+++ b/sbws/lib/resultdump.py
@@ -400,7 +400,8 @@ class Result:
 "scanner": self.scanner,
 "version": self.version,
 "relay_in_recent_consensus": self.relay_in_recent_consensus,
-"relay_recent_measurement_attempt": 
self.relay_recent_measurement_attempt,
+"relay_recent_measurement_attempt":
+self.relay_recent_measurement_attempt,
 "relay_recent_priority_list": self.relay_recent_priority_list,
 }
 
@@ -830,7 +831,8 @@ class ResultSuccess(Result):
 "relay_burst_bandwidth": self.relay_burst_bandwidth,
 "relay_observed_bandwidth": self.relay_observed_bandwidth,
 "consensus_bandwidth": self.consensus_bandwidth,
-"consensus_bandwidth_is_unmeasured": 
self.consensus_bandwidth_is_unmeasured,
+"consensus_bandwidth_is_unmeasured":
+self.consensus_bandwidth_is_unmeasured,
 }
 )
 return d



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

[tor-commits] [sbws/maint-1.1] fix: Reorder imports with isort

2021-03-18 Thread juga

commit 68cb95ba1a74a50791714c0ceb1993a831b19ac2
Author: juga0 
Date:   Tue Mar 16 19:10:34 2021 +

fix: Reorder imports with isort
---
 sbws/core/cleanup.py   | 17 +
 sbws/core/generate.py  | 22 ++--
 sbws/core/scanner.py   | 50 +-
 sbws/core/stats.py | 24 +++--
 sbws/globals.py|  7 ++--
 sbws/lib/bwfile_health.py  | 13 +++
 sbws/lib/circuitbuilder.py | 12 +--
 sbws/lib/destination.py| 13 +++
 sbws/lib/heartbeat.py  |  1 -
 sbws/lib/relaylist.py  | 10 +++---
 sbws/lib/relayprioritizer.py   |  9 +++--
 sbws/lib/resultdump.py | 21 ++-
 sbws/lib/v3bwfile.py   | 21 +--
 sbws/sbws.py   | 18 +-
 sbws/util/config.py| 15 
 sbws/util/filelock.py  |  3 +-
 sbws/util/json.py  |  2 +-
 sbws/util/parser.py|  8 ++---
 sbws/util/state.py |  5 +--
 sbws/util/stem.py  | 38 ++--
 sbws/util/timestamps.py|  2 +-
 tests/conftest.py  |  6 ++--
 tests/integration/conftest.py  |  3 +-
 tests/integration/core/test_scanner.py |  3 +-
 tests/integration/lib/test_destination.py  |  2 +-
 tests/integration/lib/test_relayprioritizer.py |  5 ++-
 tests/integration/util/test_requests.py|  3 +-
 tests/unit/conftest.py | 14 +---
 tests/unit/core/test_generate.py   |  2 +-
 tests/unit/core/test_stats.py  |  4 +--
 tests/unit/lib/test_heartbeat.py   |  1 +
 tests/unit/lib/test_resultdump.py  |  2 +-
 tests/unit/lib/test_results.py | 20 ++-
 tests/unit/lib/test_scaling.py |  2 +-
 tests/unit/lib/test_v3bwfile.py| 23 ++--
 tests/unit/util/test_config.py |  3 +-
 tests/unit/util/test_state.py  |  3 +-
 tests/unit/util/test_timestamp.py  |  6 ++--
 tests/unit/util/test_timestamps.py |  5 +--
 tests/unit/util/test_userquery.py  |  1 +
 40 files changed, 215 insertions(+), 204 deletions(-)

diff --git a/sbws/core/cleanup.py b/sbws/core/cleanup.py
index 8b7e6fd..dd43f9c 100644
--- a/sbws/core/cleanup.py
+++ b/sbws/core/cleanup.py
@@ -1,17 +1,16 @@
 """Util functions to cleanup disk space."""
+import gzip
+import logging
+import os
+import shutil
+import time
 import types
+from argparse import ArgumentDefaultsHelpFormatter
+from datetime import datetime, timedelta
 
-from sbws.util.filelock import DirectoryLock
 from sbws.globals import fail_hard
+from sbws.util.filelock import DirectoryLock
 from sbws.util.timestamp import unixts_to_dt_obj
-from argparse import ArgumentDefaultsHelpFormatter
-from datetime import datetime
-from datetime import timedelta
-import os
-import gzip
-import shutil
-import logging
-import time
 
 log = logging.getLogger(__name__)
 
diff --git a/sbws/core/generate.py b/sbws/core/generate.py
index 55bf719..ecc0b53 100644
--- a/sbws/core/generate.py
+++ b/sbws/core/generate.py
@@ -1,23 +1,23 @@
+import logging
+import os
+from argparse import ArgumentDefaultsHelpFormatter
 from math import ceil
 
 from sbws.globals import (
-fail_hard,
+DAY_SECS,
+GENERATE_PERIOD,
+NUM_MIN_RESULTS,
+PROP276_ROUND_DIG,
 SBWS_SCALE_CONSTANT,
-TORFLOW_SCALING,
 SBWS_SCALING,
 TORFLOW_BW_MARGIN,
-PROP276_ROUND_DIG,
-DAY_SECS,
-NUM_MIN_RESULTS,
-GENERATE_PERIOD,
+TORFLOW_SCALING,
+fail_hard,
 )
-from sbws.lib.v3bwfile import V3BWFile
+from sbws.lib import destination
 from sbws.lib.resultdump import load_recent_results_in_datadir
-from argparse import ArgumentDefaultsHelpFormatter
-import os
-import logging
+from sbws.lib.v3bwfile import V3BWFile
 from sbws.util.timestamp import now_fname
-from sbws.lib import destination
 
 log = logging.getLogger(__name__)
 
diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py
index ab5a99a..38ddef2 100644
--- a/sbws/core/scanner.py
+++ b/sbws/core/scanner.py
@@ -1,44 +1,42 @@
 """ Measure the relays. """
+import logging
+import os
 import queue
-
+import random
 import signal
 import sys
 import threading
+import time
 import traceback
 import uuid
-
+from argparse import ArgumentDefaultsHelpFormatter
 from multiprocessing.context import TimeoutError
+from multiprocessing.dummy import Pool
+
+import sbws.util.requests as requests_utils
+import sbws.util.stem as stem_utils
+from sbws.globals import HTTP_GET_HEADERS, TIMEOUT_MEASUREMENTS,

[tor-commits] [sbws/maint-1.1] fix: Move to declarative setup.cfg

2021-03-18 Thread juga

commit 7d26503cb32668c107bef3bae8389170c8ded14b
Author: juga0 
Date:   Tue Mar 16 14:28:09 2021 +

fix: Move to declarative setup.cfg

Also:
- Update versioneer
- And include other source distribution files in MANIFEST.in
- Add project URLs
- Add formatter and linter dependencies and configurations.
- tox: Remove travis, fix python environments
- tox: Remove extra coverage options and add them in .coveragerc.
---
 .coveragerc  |   1 +
 .gitattributes   |   1 +
 MANIFEST.in  |   8 +--
 pyproject.toml   |  24 +++
 sbws/_version.py |  25 ---
 setup.cfg|  93 --
 setup.py |  86 ++--
 tests/integration/run.sh |   3 +-
 tox.ini  |  88 +---
 versioneer.py| 169 ---
 10 files changed, 289 insertions(+), 209 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index c6303ca..ed599ae 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,2 +1,3 @@
 [run]
 omit = */__init__.py
+source = sbws
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000..cc47975
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+sbws/_version.py export-subst
diff --git a/MANIFEST.in b/MANIFEST.in
index 793621e..a5058d4 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,8 +1,8 @@
 include *.md
 include *.rst
-include *.ini
-recursive-include docs *
-prune docs/build
+recursive-include docs Makefile make.bat
+recursive-include sbws *.ini
 recursive-include tests *
 recursive-exclude **/__pycache__ *
-include versioneer.py
+recursive-exclude * *.py[co]
+prune docs/build
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 000..f790796
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,24 @@
+
+[tool.black]
+line-length = 79
+target-version = ['py36', 'py37', 'py38']
+exclude = '''
+/(
+  docs
+  | .*__init__\.py
+  | .*_version\.py
+)/
+'''
+
+
+[tool.isort]
+line_length = 79
+# Compatibility with black
+# profile = black  # does not seem to work
+multi_line_output = 3
+include_trailing_comma = true
+force_grid_wrap = 0
+use_parentheses = true
+ensure_newline_before_comments = true
+src_paths = "sbws,tests"
+skip = "versioneer.py,docs,sbws/_version.py,sbws/__init__.py"
diff --git a/sbws/_version.py b/sbws/_version.py
index e1de1ad..cbf260a 100644
--- a/sbws/_version.py
+++ b/sbws/_version.py
@@ -6,7 +6,7 @@
 # that just contains the computed version number.
 
 # This file is released into the public domain. Generated by
-# versioneer-0.18 (https://github.com/warner/python-versioneer)
+# versioneer-0.19 (https://github.com/python-versioneer/python-versioneer)
 
 """Git implementation of _version.py."""
 
@@ -57,7 +57,7 @@ HANDLERS = {}
 
 
 def register_vcs_handler(vcs, method):  # decorator
-"""Decorator to mark a method as the handler for a particular VCS."""
+"""Create decorator to mark a method as the handler of a VCS."""
 def decorate(f):
 """Store f in HANDLERS[vcs][method]."""
 if vcs not in HANDLERS:
@@ -93,9 +93,7 @@ def run_command(commands, args, cwd=None, verbose=False, 
hide_stderr=False,
 if verbose:
 print("unable to find command, tried %s" % (commands,))
 return None, None
-stdout = p.communicate()[0].strip()
-if sys.version_info[0] >= 3:
-stdout = stdout.decode()
+stdout = p.communicate()[0].strip().decode()
 if p.returncode != 0:
 if verbose:
 print("unable to run %s (error)" % dispcmd)
@@ -165,6 +163,10 @@ def git_versions_from_keywords(keywords, tag_prefix, 
verbose):
 raise NotThisMethod("no keywords at all, weird")
 date = keywords.get("date")
 if date is not None:
+# Use only the last line.  Previous lines may contain GPG signature
+# information.
+date = date.splitlines()[-1]
+
 # git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant
 # datestamp. However we prefer "%ci" (which expands to an "ISO-8601
 # -like" string, which we must then edit to make compliant), because
@@ -300,6 +302,9 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, 
run_command=run_command):
 # commit date: see ISO-8601 comment in git_versions_from_keywords()
 date = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"],
cwd=root)[0].strip()
+# Use only the last line.  Previous lines may contain GPG signature
+# information.
+date = date.splitlines()[-1]
 pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1)
 
 return pieces
@@ -338,18 +343,18 @@ def render_pep440(pieces):
 
 
 def render_pep440_pre(pieces):
-"""TAG[.post.devDISTANCE] -- No -dirty.
+"""TAG[.post0.devDISTANCE] -- No -dirty.
 
 Exceptions:
-1: no tags. 0.post.devDISTANCE
+1: no tags. 0.post0.devDISTANCE
 """
 if

62 matches

Mail list logo