date:20190919

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

2019-09-19 Thread translation

commit c49dc9920c1721db2132552b9c493b5dac4a4e8b
Author: Translation commit bot 
Date:   Fri Sep 20 05:53:04 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties_completed
---
 sk/torlauncher.properties | 158 +++---
 1 file changed, 79 insertions(+), 79 deletions(-)

diff --git a/sk/torlauncher.properties b/sk/torlauncher.properties
index 5eb4dfaa5..c5c638305 100644
--- a/sk/torlauncher.properties
+++ b/sk/torlauncher.properties
@@ -1,94 +1,94 @@
 ### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
-torlauncher.error_title=SpÃºÅ¡Å¥aÄ Tor
+# torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited_during_startup=Tor bol ukonÄenÃ½ poÄas spÃºÅ¡Å¥ania. 
Mohla to spÃ´sibiÅ¥ chyba vo VaÅ¡om torrc sÃºbore, chyba v Tor alebo inom 
programe vo VaÅ¡om systÃ©me, alebo chybnÃ½ hardvÃ©r. KÃ½m nevyrieÅ¡ite tento 
problÃ©m a nereÅ¡tartujete Tor, nebude moÅ¾nÃ© spustiÅ¥ prehliadaÄ Tor.
-torlauncher.tor_exited=Tor bol neoÄakÃ¡vane ukonÄenÃ½. Mohlo to byÅ¥ 
spÃ´sobenÃ© chybou v Tor samotnom, inÃ½m programom vo vaÅ¡om systÃ©me, alebo 
chybnÃ½m hardvÃ©rom. KÃ½m nereÅ¡tartujete Tor, Tor Browser nebude schopnÃ½ 
otvoriÅ¥ akÃ©koÄ¾vek webovÃ© strÃ¡nky. Ak problÃ©m pretrvÃ¡va, prosÃm poÅ¡lite 
kÃ³piu Tor logu tÃmu podpory.
-torlauncher.tor_exited2=ReÅ¡tartovanie Tor nezatvorÃ VaÅ¡e zÃ¡loÅ¾ky 
prehliadaÄa.
-torlauncher.tor_controlconn_failed=Nepodarilo sa pripojiÅ¥ ku kontrolnÃ©mu 
portu Tor.
-torlauncher.tor_failed_to_start=Tor sa nepodarilo spustiÅ¥.
-torlauncher.tor_control_failed=Nepodarilo sa prevziaÅ¥ kontrolu nad Torom.
-torlauncher.tor_bootstrap_failed=Toru sa nepodarilo nadviazaÅ¥ pripojenie k 
Torovskej sieti.
-torlauncher.tor_bootstrap_failed_details=%1$S zlyhalo (%2$S).
+# torlauncher.tor_exited_during_startup=Tor exited during startup. This might 
be due to an error in your torrc file, a bug in Tor or another program on your 
system, or faulty hardware. Until you fix the underlying problem and restart 
Tor, Tor Browser will not start.
+# torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug 
in Tor itself, another program on your system, or faulty hardware. Until you 
restart Tor, the Tor Browser will not able to reach any websites. If the 
problem persists, please send a copy of your Tor Log to the support team.
+# torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
+# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
+# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
+# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network 
connection.
+# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
-torlauncher.unable_to_start_tor=Nie je moÅ¾nÃ© spustiÅ¥ Tor.\n\n%S
-torlauncher.tor_missing=SpustiteÄ¾nÃ½ sÃºbor programu Tor chÃ½ba.
-torlauncher.torrc_missing=ChÃ½ba sÃºbor torrc a nemohol byÅ¥ vytvorenÃ½. 
-torlauncher.datadir_missing=PrieÄinok pre dÃ¡ta Tor neexistuje a nemohol byÅ¥ 
vytvorenÃ½.
-torlauncher.password_hash_missing=Nepodarilo sa zÃskaÅ¥ zabezpeÄenÃ© heslo.
+# torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
+# torlauncher.tor_missing=The Tor executable is missing.
+# torlauncher.torrc_missing=The torrc file is missing and could not be created.
+# torlauncher.datadir_missing=The Tor data directory does not exist and could 
not be created.
+# torlauncher.password_hash_missing=Failed to get hashed password.
 
-torlauncher.failed_to_get_settings=Nie je moÅ¾nÃ© prijaÅ¥ nastavenia Tor.\n\n%S
-torlauncher.failed_to_save_settings=Nie je moÅ¾nÃ© uloÅ¾iÅ¥ nastavenia 
Tor.\n\n%S
-torlauncher.ensure_tor_is_running=ProsÃm uistite sa, Å¾e Tor je spustenÃ½.
+# torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
+# torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S
+# torlauncher.ensure_tor_is_running=Please ensure that Tor is running.
 
-torlauncher.error_proxy_addr_missing=MusÃte Å¡pecifikovaÅ¥ IP adresu alebo 
nÃ¡zov hostiteÄ¾a a ÄÃslo portu aby bolo moÅ¾nÃ© nakonfigurovaÅ¥ Tor na 
pouÅ¾Ãvanie proxy na prÃstup k Internetu.
-torlauncher.error_proxy_type_missing=MusÃte zvoliÅ¥ typ proxy.
-torlauncher.error_bridges_missing=MusÃte Å¡pecifikovaÅ¥ jeden alebo viac 
mostov.
-torlauncher.error_default_bridges_type_missing=MusÃte zvoliÅ¥ prepravnÃ½ typ 
pre poskytnutÃ© mosty.
-torlauncher.error_bridgedb_bridges_missing=VyÅ¾iadaÅ¥ si premostenie.
-torlauncher.error_bridge_bad_default_type=Å½iadne poskytnutÃ© mosty nemajÃº 
dostupnÃ½ prepravnÃ½ typ %S. ProsÃme upravte svoje nastavenia.
+# torlauncher.error_proxy_addr_missing=You must specify both an IP address or 
hostname and a port number to configure Tor to use a proxy to access the 
Internet.
+# torlauncher.error_proxy_type_missing=You must select the proxy type.
+# torlauncher.error_bridges_missing=You must specify one

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

2019-09-19 Thread translation

commit e6633d41882dec321a5bf79aa2f30217afa63ba4
Author: Translation commit bot 
Date:   Fri Sep 20 05:52:57 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties
---
 sk/torlauncher.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sk/torlauncher.properties b/sk/torlauncher.properties
index 5eb4dfaa5..548e5984a 100644
--- a/sk/torlauncher.properties
+++ b/sk/torlauncher.properties
@@ -4,7 +4,7 @@
 torlauncher.error_title=SpÃºÅ¡Å¥aÄ Tor
 
 torlauncher.tor_exited_during_startup=Tor bol ukonÄenÃ½ poÄas spÃºÅ¡Å¥ania. 
Mohla to spÃ´sibiÅ¥ chyba vo VaÅ¡om torrc sÃºbore, chyba v Tor alebo inom 
programe vo VaÅ¡om systÃ©me, alebo chybnÃ½ hardvÃ©r. KÃ½m nevyrieÅ¡ite tento 
problÃ©m a nereÅ¡tartujete Tor, nebude moÅ¾nÃ© spustiÅ¥ prehliadaÄ Tor.
-torlauncher.tor_exited=Tor bol neoÄakÃ¡vane ukonÄenÃ½. Mohlo to byÅ¥ 
spÃ´sobenÃ© chybou v Tor samotnom, inÃ½m programom vo vaÅ¡om systÃ©me, alebo 
chybnÃ½m hardvÃ©rom. KÃ½m nereÅ¡tartujete Tor, Tor Browser nebude schopnÃ½ 
otvoriÅ¥ akÃ©koÄ¾vek webovÃ© strÃ¡nky. Ak problÃ©m pretrvÃ¡va, prosÃm poÅ¡lite 
kÃ³piu Tor logu tÃmu podpory.
+torlauncher.tor_exited=Tor bol neoÄakÃ¡vane ukonÄenÃ½. Mohlo to byÅ¥ 
spÃ´sobenÃ© chybou v Tor samotnom, inÃ½m programom vo vaÅ¡om systÃ©me, alebo 
chybnÃ½m hardvÃ©rom. KÃ½m nereÅ¡tartujete Tor, PrehliadaÄ Tor nebude schopnÃ½ 
otvoriÅ¥ akÃ©koÄ¾vek webovÃ© strÃ¡nky. Ak problÃ©m pretrvÃ¡va, prosÃm poÅ¡lite 
kÃ³piu Tor logu tÃmu podpory.
 torlauncher.tor_exited2=ReÅ¡tartovanie Tor nezatvorÃ VaÅ¡e zÃ¡loÅ¾ky 
prehliadaÄa.
 torlauncher.tor_controlconn_failed=Nepodarilo sa pripojiÅ¥ ku kontrolnÃ©mu 
portu Tor.
 torlauncher.tor_failed_to_start=Tor sa nepodarilo spustiÅ¥.

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

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

2019-09-19 Thread translation

commit b2f5eb9666f1696878e155be17731ac73a1b7874
Author: Translation commit bot 
Date:   Fri Sep 20 05:46:54 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml
---
 sk/strings.xml | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/sk/strings.xml b/sk/strings.xml
index cb5acbb4f..28373faa9 100644
--- a/sk/strings.xml
+++ b/sk/strings.xml
@@ -1,2 +1,10 @@
 
-
+OrfoxRIP
+VyskÃºÅ¡ajte PrehliadaÄ Tor
+Orfox sa zmenil na PrehliadaÄ Tor 
pre Android.
+ZÃskajte ho z vami preferovanÃ©ho zdroja:
+PrejsÅ¥ do F-DROID
+PrejsÅ¥ do GOOGLE PLAY
+StiahnuÅ¥ .APK
+ExportovaÅ¥ zÃ¡loÅ¾ky
+

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

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

2019-09-19 Thread translation

commit 38186662a64ce1a14f0e57cfcd554279210b0a2f
Author: Translation commit bot 
Date:   Fri Sep 20 05:46:05 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
---
 sk/https-everywhere.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sk/https-everywhere.dtd b/sk/https-everywhere.dtd
index 035cd046d..d6d653726 100644
--- a/sk/https-everywhere.dtd
+++ b/sk/https-everywhere.dtd
@@ -30,20 +30,20 @@
 
 
 
-
+
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
+
 
 
 

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

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

2019-09-19 Thread translation

commit 4d2275155f5866ca7a3f85600ea687fa7bb875e4
Author: Translation commit bot 
Date:   Fri Sep 20 05:16:07 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
---
 sk/https-everywhere.dtd | 24 
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/sk/https-everywhere.dtd b/sk/https-everywhere.dtd
index afe72c2e3..035cd046d 100644
--- a/sk/https-everywhere.dtd
+++ b/sk/https-everywhere.dtd
@@ -7,15 +7,15 @@
 
 
 
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
 
 
 
@@ -46,9 +46,9 @@
 
 
 
-
-
-
+
+
+
 
 
 

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

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

2019-09-19 Thread translation

commit 1ed1650fa287b79cd1892f9a5bf22ba4a731344f
Author: Translation commit bot 
Date:   Fri Sep 20 03:49:59 2019 +


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

diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po
index 886988c6e..d579c4519 100644
--- a/pt_BR/pt_BR.po
+++ b/pt_BR/pt_BR.po
@@ -7,6 +7,7 @@
 # Communia , 2013-2018
 # 8fcf29cd1b543ef9efd592d828027578, 2012
 # carlo giusepe tadei valente sasaki , 2014
+# Chacal E., 2019
 # Communia , 2013
 # Eduardo Addad de Oliveira , 2018
 # Eduardo Bonsi, 2013
@@ -25,8 +26,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2019-09-14 14:38+0200\n"
-"PO-Revision-Date: 2019-09-14 13:26+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-09-20 03:23+\n"
+"Last-Translator: Chacal E.\n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -98,7 +99,7 @@ msgstr "%s Ã© um dispositivo Ã³ptico."
 #: ../lib/Tails/Persistence/Setup.pm:444
 #, perl-format
 msgid "Device %s was not created using a USB image or Tails Installer."
-msgstr ""
+msgstr "O dispositivo %s nÃ£o foi criado usando uma imagem USB ou o Tails 
Installer."
 
 #: ../lib/Tails/Persistence/Setup.pm:688
 msgid "Persistence wizard - Finished"

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

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

2019-09-19 Thread translation

commit 5dc885bda00e609282715401233a46c33df6af04
Author: Translation commit bot 
Date:   Fri Sep 20 03:45:46 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/pt_BR/LC_MESSAGES/messages.po | 23 +--
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/locale/pt_BR/LC_MESSAGES/messages.po 
b/locale/pt_BR/LC_MESSAGES/messages.po
index f50290804..47c154998 100644
--- a/locale/pt_BR/LC_MESSAGES/messages.po
+++ b/locale/pt_BR/LC_MESSAGES/messages.po
@@ -544,7 +544,7 @@ msgstr "Doe usando o BTCPayServer"
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:126
 msgid "Donate using wallet addresses"
-msgstr ""
+msgstr "Doe usando endereÃ§os de carteira"
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:133
 #: 
tmp/cache_locale/70/70a3de9c7fb70a68cae132efaa24457b72f71189189cd4c8c492f3cd459b6483.php:77
@@ -2757,41 +2757,52 @@ msgid ""
 "the growing threats to privacy, freedom of expression, and access to "
 "information online."
 msgstr ""
+"Os CampeÃµes da Privacidade fazem uma promessa significativa de US $1.000 ou "
+"mais, criando uma fonte estÃ¡vel e confiÃ¡vel de fundos para nos ajudar a ser 
"
+"Ã¡geis em nossa defesa contra as crescentes ameaÃ§as Ã  privacidade, 
liberdade "
+"de expressÃ£o e acesso a informaÃ§Ãµes online."
 
 #: 
tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:87
 msgid ""
 "As a Champion of Privacy, youll receive exclusive gifts and invitations to "
 "online events that will give you insider access to whats happening at Tor."
 msgstr ""
+"Como um campeÃ£o da privacidade, vocÃª receberÃ¡ presentes e convites "
+"exclusivos para eventos online que lhe darÃ£o acesso privilegiado ao que 
estÃ¡"
+" acontecendo no Tor."
 
 #: 
tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:91
 msgid ""
 "We believe everyone in the world should be able to enjoy the luxury our "
 "tools provide: private access to the open web."
 msgstr ""
+"Acreditamos que todos no mundo devem poder aproveitar o luxo que nossas "
+"ferramentas oferecem: acesso privado Ã  web aberta."
 
 #: 
tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:93
 msgid ""
 "The Tor Project counts on the support of our Champions of Privacy to keep "
 "our software strong and available to everyone who needs it."
 msgstr ""
+"O Projeto Tor conta com o apoio de nossos defensores da privacidade para "
+"manter nosso software forte e disponÃvel para todos que precisam."
 
 #: 
tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:95
 msgid "With your help, we can make the Tor network accessible to all."
-msgstr ""
+msgstr "Com sua ajuda, podemos tornar a rede Tor acessÃvel a todos."
 
 #: 
tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:99
 msgid "Were standing up for the universal human right to privacy."
-msgstr ""
+msgstr "DefendÃamos o direito humano universal Ã  privacidade."
 
 #: 
tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:101
 msgid "Join us by becoming a Champion of Privacy today."
-msgstr ""
+msgstr "Junte-se a nÃ³s hoje, tornando-se um campeÃ£o de privacidade."
 
 #: 
tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:108
 msgid "Join with a monthly gift of $84 per month, or more."
-msgstr ""
+msgstr "Associe-se com um presente mensal de US $84 por mÃªs ou mais."
 
 #: 
tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:114
 msgid "Join with cryptocurrency."
-msgstr ""
+msgstr "Junte-se Ã  criptomoeda."

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

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

2019-09-19 Thread translation

commit 3ed1bd721fd2f94b39914405854ed8d8960db7e1
Author: Translation commit bot 
Date:   Fri Sep 20 03:22:41 2019 +

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

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index fe6621890..72042499a 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -10,9 +10,9 @@
 # Gus, 2019
 # erinm, 2019
 # Eduardo Addad de Oliveira , 2019
-# Chacal E., 2019
 # Emma Peel, 2019
 # Communia , 2019
+# Chacal E., 2019
 # 
 msgid ""
 msgstr ""
@@ -20,7 +20,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Communia , 2019\n"
+"Last-Translator: Chacal E., 2019\n"
 "Language-Team: Portuguese (Brazil) 
(https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

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

2019-09-19 Thread translation

commit 9245cf8857ffb39c0a85e8c3b38f9680a60ff211
Author: Translation commit bot 
Date:   Fri Sep 20 03:22:33 2019 +

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

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index 126063bdb..6f58606e2 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -10,9 +10,9 @@
 # Gus, 2019
 # erinm, 2019
 # Eduardo Addad de Oliveira , 2019
-# Chacal E., 2019
 # Emma Peel, 2019
 # Communia , 2019
+# Chacal E., 2019
 # 
 msgid ""
 msgstr ""
@@ -20,7 +20,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Communia , 2019\n"
+"Last-Translator: Chacal E., 2019\n"
 "Language-Team: Portuguese (Brazil) 
(https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -763,7 +763,7 @@ msgstr ""
 #: https//www.torproject.org/about/trademark/trademark-faq/
 #: (content/about/trademark/trademark-faq/contents+en.lrtopic.title)
 msgid "Tor Trademark Frequently Asked Questions"
-msgstr ""
+msgstr "Perguntas frequentes sobre marcas comerciais da Tor"
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:73 templates/footer.html:9
@@ -867,7 +867,7 @@ msgstr "Fale com a gente sobre como melhorar nossos 
websites."
 
 #: templates/contact.html:17
 msgid "Discuss UX related ideas."
-msgstr ""
+msgstr "Discuta idÃ©ias relacionadas ao UX."
 
 #: templates/contact.html:23
 msgid "Find us on Social Media"

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

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

2019-09-19 Thread translation

commit b3c9d00fca1335521d6b9192a4d0743ef300a7e6
Author: Translation commit bot 
Date:   Fri Sep 20 03:15:40 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/pt_BR/LC_MESSAGES/messages.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/pt_BR/LC_MESSAGES/messages.po 
b/locale/pt_BR/LC_MESSAGES/messages.po
index 824c23ea7..f50290804 100644
--- a/locale/pt_BR/LC_MESSAGES/messages.po
+++ b/locale/pt_BR/LC_MESSAGES/messages.po
@@ -540,7 +540,7 @@ msgstr "VocÃª deseja doar usando cartÃ£o de crÃ©dito ou 
Paypal?"
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:92
 msgid "Donate using BTCPayServer"
-msgstr ""
+msgstr "Doe usando o BTCPayServer"
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:126
 msgid "Donate using wallet addresses"

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

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

2019-09-19 Thread translation

commit 7394eb9c152fcc6288d13b68543f3b584346bff1
Author: Translation commit bot 
Date:   Thu Sep 19 22:46:48 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
---
 code_of_conduct+pt_BR.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code_of_conduct+pt_BR.po b/code_of_conduct+pt_BR.po
index 77745deb1..925ae181e 100644
--- a/code_of_conduct+pt_BR.po
+++ b/code_of_conduct+pt_BR.po
@@ -157,7 +157,7 @@ msgid ""
 "  DON'T: Treat honest mistakes as an excuse to hassle people. Mistakes are 
for\n"
 "learning.\n"
 msgstr ""
-"  NÃO FAÃA: Trate erros honestos como desculpa para assediar pessoas. Erros 
sÃ£o para\n"
+"  NÃO FAÃA: Tratar erros honestos como desculpa para aborrecer os outros. 
Erros sÃ£o para o nosso\n"
 "aprendizado.\n"
 
 #. type: Plain text
@@ -167,7 +167,7 @@ msgid ""
 "  DON'T: Hunt for ways to uphold the letter of this code while violating 
its\n"
 "spirit.\n"
 msgstr ""
-"  NÃO FAÃA: Procure maneiras de defender este cÃ³digo, violando seu "
+"  NÃO FAÃA: Procurar maneiras de defender este cÃ³digo, violando seu "
 "espÃrito.\n"
 
 #. type: Plain text

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

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

2019-09-19 Thread translation

commit f523d458691dddaf122735f04a4e3d56dc9e1306
Author: Translation commit bot 
Date:   Thu Sep 19 22:17:00 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
---
 code_of_conduct+pt_BR.po | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/code_of_conduct+pt_BR.po b/code_of_conduct+pt_BR.po
index bd11d50c9..77745deb1 100644
--- a/code_of_conduct+pt_BR.po
+++ b/code_of_conduct+pt_BR.po
@@ -109,20 +109,22 @@ msgstr ""
 #: ../code_of_conduct.txt:29
 msgid "The Tor community should be a good place where people are glad to be."
 msgstr ""
-"A comunidade Tor deve ser um bom lugar, onde pessoas estÃ£o contentes em "
+"A comunidade Tor deve ser um bom lugar, onde as pessoas fiquem contentes em "
 "estar."
 
 #. type: Plain text
 #: ../code_of_conduct.txt:31
 #, no-wrap
 msgid "  DO: Be kind, thoughtful, and considerate.\n"
-msgstr "FAÃA: Seja uma pessoa gentil, atenciosa e cuidadosa.\n"
+msgstr ""
+"FAÃA: Seja uma pessoa gentil, atenciosa e tenha consideraÃ§Ã£o pelos 
outros.\n"
 
 #. type: Plain text
 #: ../code_of_conduct.txt:33
 #, no-wrap
 msgid "  DO: Make Tor a place where people are happy and comfortable.\n"
-msgstr "FAÃA: Torne o Tor um lugar onde pessoas estÃ£o felizes e 
confortÃ¡veis.\n"
+msgstr ""
+"FAÃA: Torne o Tor um lugar onde as pessoas se sintam felizes e Ã  vontade.\n"
 
 #. type: Plain text
 #: ../code_of_conduct.txt:36
@@ -139,13 +141,14 @@ msgstr ""
 #, no-wrap
 msgid "  DO: Yield the floor. Listen. Make sure everyone gets heard.\n"
 msgstr ""
-"  FAÃA: Deixe o outro falar. Escute. Tenha certeza que todos sÃ£o ouvidos.\n"
+"  FAÃA: Deixe as outras pessoas falarem. Escute. Cuide para que todos sejam "
+"ouvidos.\n"
 
 #. type: Plain text
 #: ../code_of_conduct.txt:40
 #, no-wrap
 msgid "  DON'T: Insult, harass, intimidate, or be a jerk.\n"
-msgstr "  NÃO FAÃA: Insultar, assediar, intimidar ou ser um babaca.\n"
+msgstr "  NÃO FAÃA: Insultar, assediar, intimidar nem ser babaca.\n"
 
 #. type: Plain text
 #: ../code_of_conduct.txt:43

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

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

2019-09-19 Thread translation

commit def149af141a833d6cc5bf08f37e46ce8d07abac
Author: Translation commit bot 
Date:   Thu Sep 19 21:46:56 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot_completed
---
 code_of_conduct+pt_BR.po | 812 ---
 1 file changed, 812 deletions(-)

diff --git a/code_of_conduct+pt_BR.po b/code_of_conduct+pt_BR.po
deleted file mode 100644
index 9cd886d8e..0
--- a/code_of_conduct+pt_BR.po
+++ /dev/null
@@ -1,812 +0,0 @@
-# Code of conduct of the tor project
-# Copyright (C) 2019 tor project.
-# This Code of Conduct is licensed under a Creative Commons CC-BY-SA 4.0
-# International license.e.
-# FIRST AUTHOR , YEAR.
-# 
-# Translators:
-# Hildeberto Abreu MagalhÃ£es , 2019
-# Eduardo Addad de Oliveira , 2019
-# Irio Musskopf, 2019
-# Cy Belle , 2019
-# Communia , 2019
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: Code of conduct of the Tor Project\n"
-"POT-Creation-Date: 2019-08-02 12:00+\n"
-"PO-Revision-Date: 2019-08-27 18:54+\n"
-"Last-Translator: Communia , 2019\n"
-"Language-Team: Portuguese (Brazil) 
(https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Plain text
-#: ../code_of_conduct.txt:1 ../code_of_conduct.txt:24
-#: ../code_of_conduct.txt:51 ../code_of_conduct.txt:75
-#: ../code_of_conduct.txt:104 ../code_of_conduct.txt:180
-#: ../code_of_conduct.txt:193 ../code_of_conduct.txt:213
-#: ../code_of_conduct.txt:231 ../code_of_conduct.txt:243
-#: ../code_of_conduct.txt:253 ../code_of_conduct.txt:278
-#, no-wrap
-msgid "\n"
-msgstr "\n"
-
-#. type: Plain text
-#: ../code_of_conduct.txt:3
-#, no-wrap
-msgid ""
-"Tor Project Code of Conduct\n"
-"\n"
-msgstr ""
-"CÃ³digo de Conduta do Projeto Tor\n"
-"\n"
-
-#. type: Plain text
-#: ../code_of_conduct.txt:6
-msgid "Statement of Intent:"
-msgstr "DeclaraÃ§Ã£o de IntenÃ§Ã£o:"
-
-#. type: Plain text
-#: ../code_of_conduct.txt:10
-msgid ""
-"The Tor Project is committed to fostering an inclusive environment and "
-"community. Tor is a place where people should feel safe to engage, share "
-"their point of view, and participate."
-msgstr ""
-"O Projeto Tor estÃ¡ empenhado em promover um ambiente inclusivo e "
-"comunitÃ¡rio. Tor Ã© um espaÃ§o onde as pessoas devem se sentir seguras para "
-"envolver-se, compartilhar seu ponto de vista e participar."
-
-#. type: Plain text
-#: ../code_of_conduct.txt:15
-msgid ""
-"This code of conduct applies to The Tor Project as a whole. It is intended "
-"to provide guidelines for contributors. Employees and contractors of The Tor"
-" Project, Inc. (TPI) are also subject to company policies and procedures. "
-"Those people should feel free to contact HR with questions or concerns."
-msgstr ""
-"Este cÃ³digo de conduta se aplica ao Projeto Tor como um todo. Destina-se a "
-"fornecer orientaÃ§Ãµes para os contribuidores. Os funcionÃ¡rios e contratados 
"
-"do The Tor Project, Inc. (TPI) tambÃ©m estÃ£o sujeitos Ã s polÃticas e "
-"procedimentos da empresa. Essas pessoas devem se sentir livres para entrar "
-"em contato com o RH com perguntas ou preocupaÃ§Ãµes."
-
-#. type: Plain text
-#: ../code_of_conduct.txt:23
-msgid ""
-"This code of conduct is not exhaustive or complete. It is an ongoing effort "
-"to summarize our shared understanding. We want to provide a welcoming, safe "
-"environment, so we can work together to pursue powerful solutions. We "
-"reserve the right to deviate from strictly enforcing this code. Any "
-"deviations must produce an outcome which is fairer, and aligned with our "
-"values. We understand that keeping a living document relevant and 
âpatchedâ "
-"involves sustained effort."
-msgstr ""
-"Este cÃ³digo de conduta nÃ£o Ã© exaustivo ou completo. Ã um esforÃ§o 
contÃnuo "
-"para resumir nosso entendimento compartilhado. Queremos oferecer um ambiente"
-" acolhedor e seguro, para que possamos trabalhar juntos em busca de 
soluÃ§Ãµes"
-" poderosas. Nos reservamos ao direito de desviarmos da aplicaÃ§Ã£o estrita "
-"deste cÃ³digo. Quaisquer desvios devem produzir um resultado mais justo e "
-"alinhado com nossos valores. Entendemos que manter um documento vivo "
-"relevante e âremendadoâ envolve um esforÃ§o sustentado."
-
-#. type: Plain text
-#: ../code_of_conduct.txt:26
-#, no-wrap
-msgid ""
-"0. Summary: Don't be a jerk. Be awesome instead.\n"
-"\n"
-msgstr ""
-"0. SumÃ¡rio: NÃ£o seja idiota. Em vez disso, seja incrÃvel.\n"
-"\n"
-
-#. type:

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

2019-09-19 Thread translation

commit 0fd145afed199a9e3876b7b49219222b96e3f7b4
Author: Translation commit bot 
Date:   Thu Sep 19 21:46:51 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
---
 code_of_conduct+pt_BR.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code_of_conduct+pt_BR.po b/code_of_conduct+pt_BR.po
index 9cd886d8e..bd11d50c9 100644
--- a/code_of_conduct+pt_BR.po
+++ b/code_of_conduct+pt_BR.po
@@ -49,7 +49,7 @@ msgstr ""
 #. type: Plain text
 #: ../code_of_conduct.txt:6
 msgid "Statement of Intent:"
-msgstr "DeclaraÃ§Ã£o de IntenÃ§Ã£o:"
+msgstr "DeclaraÃ§Ã£o de IntenÃ§Ãµes:"
 
 #. type: Plain text
 #: ../code_of_conduct.txt:10
@@ -59,8 +59,8 @@ msgid ""
 "their point of view, and participate."
 msgstr ""
 "O Projeto Tor estÃ¡ empenhado em promover um ambiente inclusivo e "
-"comunitÃ¡rio. Tor Ã© um espaÃ§o onde as pessoas devem se sentir seguras para "
-"envolver-se, compartilhar seu ponto de vista e participar."
+"comunitÃ¡rio. Tor Ã© um espaÃ§o onde as pessoas devem se sentir seguras para 
se"
+" envolver, compartilhar seu ponto de vista e participar."
 
 #. type: Plain text
 #: ../code_of_conduct.txt:15

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

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

2019-09-19 Thread translation

commit 7323b6adf512ede058e215c9fdf931de2bc79dee
Author: Translation commit bot 
Date:   Thu Sep 19 21:16:56 2019 +


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

diff --git a/code_of_conduct+pt_BR.po b/code_of_conduct+pt_BR.po
index 240555fb0..9cd886d8e 100644
--- a/code_of_conduct+pt_BR.po
+++ b/code_of_conduct+pt_BR.po
@@ -43,7 +43,7 @@ msgid ""
 "Tor Project Code of Conduct\n"
 "\n"
 msgstr ""
-"Tor Project CÃ³digo de Conduta\n"
+"CÃ³digo de Conduta do Projeto Tor\n"
 "\n"
 
 #. type: Plain text

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

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

2019-09-19 Thread translation

commit eb9ff8921b45ccfea7389342570859d8c50aa87c
Author: Translation commit bot 
Date:   Thu Sep 19 21:16:50 2019 +


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

diff --git a/code_of_conduct+pt_BR.po b/code_of_conduct+pt_BR.po
index 240555fb0..9cd886d8e 100644
--- a/code_of_conduct+pt_BR.po
+++ b/code_of_conduct+pt_BR.po
@@ -43,7 +43,7 @@ msgid ""
 "Tor Project Code of Conduct\n"
 "\n"
 msgstr ""
-"Tor Project CÃ³digo de Conduta\n"
+"CÃ³digo de Conduta do Projeto Tor\n"
 "\n"
 
 #. type: Plain text

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

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

2019-09-19 Thread translation

commit f3988de3b2e813bd05d36cd1985f732646959af1
Author: Translation commit bot 
Date:   Thu Sep 19 20:52:37 2019 +

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

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index f1e1f89d0..126063bdb 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -216,6 +216,10 @@ msgid ""
 "bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
 "putting yourself at risk."
 msgstr ""
+"Por favor, baixe a versÃ£o alfa somente se vocÃª aceitar que algumas coisas "
+"talvez nÃ£o funcionem corretamente, quiser nos ajudar encontrando e "
+"[relatando problemas](https://support.torproject.org/misc/bug-or-feedback/) "
+"e nÃ£o estiver se colocando em risco."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -836,7 +840,7 @@ msgstr ""
 
 #: templates/contact.html:11
 msgid "Get in touch with other translators"
-msgstr ""
+msgstr "Entre em contato com outras pessoas que contribuem com traduÃ§Ã£o"
 
 #: templates/contact.html:12
 msgid "Watch or join publicly logged team meetings."
@@ -846,6 +850,8 @@ msgstr "Assista ou participe de reuniÃµes da equipe 
publicamente registradas."
 msgid ""
 "Discuss organization and community related topics: meetups and outreach."
 msgstr ""
+"Discuta assuntos relacionados a organizaÃ§Ã£o e a comunidade: encontros e "
+"divulgaÃ§Ã£o."
 
 #: templates/contact.html:14
 msgid "Discuss running a Tor relay."
@@ -857,7 +863,7 @@ msgstr "Fale com a comunidade do sul global do Tor."
 
 #: templates/contact.html:16
 msgid "Talk with us about improvements on our websites."
-msgstr ""
+msgstr "Fale com a gente sobre como melhorar nossos websites."
 
 #: templates/contact.html:17
 msgid "Discuss UX related ideas."
@@ -977,7 +983,7 @@ msgstr "VÃ¡ para o Google Play"
 
 #: templates/download-android.html:26
 msgid "Go to F-Droid"
-msgstr ""
+msgstr "Ir para F-Droid"
 
 #: templates/download-android.html:36
 msgid "Are you an iOS user? We encourage you to try Onion Browser."
@@ -1104,7 +1110,7 @@ msgstr "Download em outro idioma ou plataforma"
 
 #: templates/hero-download.html:46
 msgid "Download the latest alpha build"
-msgstr ""
+msgstr "Fazer download da versÃ£o alfa mais recente"
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"

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

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

2019-09-19 Thread translation

commit 2a27e9e64dbac99a5fc684107d76ee084ff87186
Author: Translation commit bot 
Date:   Thu Sep 19 20:52:45 2019 +

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

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index 383b09407..fe6621890 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -216,6 +216,10 @@ msgid ""
 "bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not "
 "putting yourself at risk."
 msgstr ""
+"Por favor, baixe a versÃ£o alfa somente se vocÃª aceitar que algumas coisas "
+"talvez nÃ£o funcionem corretamente, quiser nos ajudar encontrando e "
+"[relatando problemas](https://support.torproject.org/misc/bug-or-feedback/) "
+"e nÃ£o estiver se colocando em risco."
 
 #: https//www.torproject.org/download/languages/
 #: (content/download/languages/contents+en.lrpage.title)
@@ -1017,7 +1021,7 @@ msgstr "Download em outro idioma ou plataforma"
 
 #: templates/hero-download.html:46
 msgid "Download the latest alpha build"
-msgstr ""
+msgstr "Fazer download da versÃ£o alfa mais recente"
 
 #: templates/hero-download.html:50
 msgid "Read the latest release announcements"

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

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

2019-09-19 Thread translation

commit 13ed720ab5d3ff4de6fa48671640e9df365c1d2b
Author: Translation commit bot 
Date:   Thu Sep 19 20:22:32 2019 +

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

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index 7b32b9b20..f1e1f89d0 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -8,11 +8,11 @@
 # Alexei GonÃ§alves de Oliveira , 2019
 # Danihells , 2019
 # Gus, 2019
-# Communia , 2019
 # erinm, 2019
 # Eduardo Addad de Oliveira , 2019
-# Emma Peel, 2019
 # Chacal E., 2019
+# Emma Peel, 2019
+# Communia , 2019
 # 
 msgid ""
 msgstr ""
@@ -20,7 +20,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Chacal E., 2019\n"
+"Last-Translator: Communia , 2019\n"
 "Language-Team: Portuguese (Brazil) 
(https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1415,15 +1415,15 @@ msgstr "Ler mais."
 
 #: templates/macros/question.html:12
 msgid "Contributors to this page:"
-msgstr "Contribuidores para esta pÃ¡gina:"
+msgstr "Contribuidores desta pÃ¡gina:"
 
 #: templates/macros/question.html:14
 msgid "Edit this page"
-msgstr "Edite essa pÃ¡gina"
+msgstr "Editar esta pÃ¡gina"
 
 #: templates/macros/question.html:15
 msgid "Suggest Feedback"
-msgstr "Sugerir Feedback"
+msgstr "Sugerir ComentÃ¡rio"
 
 #: templates/macros/question.html:16
 msgid "Permalink"

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

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

2019-09-19 Thread translation

commit 28aae66e100dc305a49860480ae25248d353df14
Author: Translation commit bot 
Date:   Thu Sep 19 20:22:39 2019 +

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

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index 44667093a..383b09407 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -8,11 +8,11 @@
 # Alexei GonÃ§alves de Oliveira , 2019
 # Danihells , 2019
 # Gus, 2019
-# Communia , 2019
 # erinm, 2019
 # Eduardo Addad de Oliveira , 2019
-# Emma Peel, 2019
 # Chacal E., 2019
+# Emma Peel, 2019
+# Communia , 2019
 # 
 msgid ""
 msgstr ""
@@ -20,7 +20,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-09-17 15:46+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Chacal E., 2019\n"
+"Last-Translator: Communia , 2019\n"
 "Language-Team: Portuguese (Brazil) 
(https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1308,15 +1308,15 @@ msgstr ""
 
 #: templates/macros/question.html:14
 msgid "Edit this page"
-msgstr ""
+msgstr "Editar esta pÃ¡gina"
 
 #: templates/macros/question.html:15
 msgid "Suggest Feedback"
-msgstr ""
+msgstr "Sugerir ComentÃ¡rio"
 
 #: templates/macros/question.html:16
 msgid "Permalink"
-msgstr ""
+msgstr "Link permanente"
 
 #: templates/macros/reports.html:5 templates/macros/reports.html:19
 msgid "View PDF"

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

[tor-commits] [community/master] Use Docker's 'latest' tag for up-to-date image.

2019-09-19 Thread phw

commit 2879ca75eb9411fe4060c2ed9503dcbba3b0d871
Author: Philipp Winter 
Date:   Thu Sep 19 12:28:45 2019 -0700

Use Docker's 'latest' tag for up-to-date image.
---
 content/relay-operations/technical-setup/bridge/docker/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr 
b/content/relay-operations/technical-setup/bridge/docker/contents.lr
index bf5f5b1..f82a65e 100644
--- a/content/relay-operations/technical-setup/bridge/docker/contents.lr
+++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr
@@ -8,7 +8,7 @@ body:
 
 We are maintaining a docker container that allows you to quickly set up an 
obfs4 bridge. First, fetch the container:
 
-`docker pull phwinter/obfs4-bridge:0.2`
+`docker pull phwinter/obfs4-bridge:latest`
 
 Now, it's time to run the container.  We maintain a script that automatically 
determines a free OR and obfs4 port for you. The script only requires your 
email address as argument:
```

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

[tor-commits] [torspec/master] Update padding-spec.txt to cover hs circuit padding.

2019-09-19 Thread nickm

commit a7e52fc35d4dc83259f98f84563617dee3801e0a
Author: Mike Perry 
Date:   Wed Aug 14 19:07:59 2019 -0500

Update padding-spec.txt to cover hs circuit padding.

Also update padding proposals that are deprecated by padding-spec.txt,
to refer the reader to the new spec.
---
 padding-spec.txt   | 266 -
 proposals/251-netflow-padding.txt  |   2 +-
 .../302-padding-machines-for-onion-clients.txt |   6 +-
 3 files changed, 267 insertions(+), 7 deletions(-)

diff --git a/padding-spec.txt b/padding-spec.txt
index b85f0fd..455c5eb 100644
--- a/padding-spec.txt
+++ b/padding-spec.txt
@@ -1,6 +1,6 @@
  Tor Padding Specification
 
-Mike Perry
+Mike Perry, George Kadianakis
 
 Note: This is an attempt to specify Tor as currently implemented.  Future
 versions of Tor will implement improved algorithms.
@@ -35,9 +35,15 @@ the anonymity and load-balancing implications of their 
choices.
   padding to be sent to any intermediate node in a circuit (as per Section
   6.1 of tor-spec.txt).
 
-  Currently, only single-hop CELL_PADDING is used by Tor. It is described in
-  Section 2. At a later date, further sections will be added to this document
-  to describe various uses of multi-hop circuit-level padding.
+  Tor uses both connection level and circuit level padding. Connection
+  level padding is described in section 2. Circuit level padding is
+  described in section 3.
+
+  The circuit-level padding system is completely orthogonal to the
+  connection-level padding. The connection-level padding system regards
+  circuit-level padding as normal data traffic, and hence the connection-level
+  padding system will not add any additional overhead while the circuit-level
+  padding system is actively padding.
 
 
 2. Connection-level padding
@@ -274,11 +280,257 @@ the anonymity and load-balancing implications of their 
choices.
 open.
   - Default: 3600
 
+
+3. Circuit-level padding
+
+  The circuit padding system in Tor is an extension of the WTF-PAD
+  event-driven state machine design[15]. At a high level, this design places
+  one or more padding state machines at the client, and one or more padding
+  state machines at a relay, on each circuit.
+
+  State transition and histogram generation has been generalized to be fully
+  programmable, and probability distribution support was added to support more
+  compact representations like APE[16]. Additionally, packet count limits,
+  rate limiting, and circuit application conditions have been added.
+
+  At present, Tor uses this system to deploy two pairs of circuit padding
+  machines, to obscure differences between the setup phase of client-side
+  onion service circuits, up to the first 10 cells.
+
+  This specification covers only the resulting behavior of these padding
+  machines, and thus does not cover the state machine implementation details or
+  operation. For full details on using the circuit padding system to develop
+  future padding defenses, see the research developer documentation[17].
+
+3.1. Circuit Padding Negotiation
+
+  Circuit padding machines are advertised as "Padding" subprotocol versions
+  (see tor-spec.txt Section 9). The onion service circuit padding machines are
+  advertised as "Padding=2".
+
+  Because circuit padding machines only become active at certain points in
+  circuit lifetime, and because more than one padding machine may be active at
+  any given point in circuit lifetime, there is also a padding negotiation 
cell,
+  with fields as follows:
+
+ const CIRCPAD_COMMAND_STOP = 1;
+ const CIRCPAD_COMMAND_START = 2;
+
+ const CIRCPAD_RESPONSE_OK = 1;
+ const CIRCPAD_RESPONSE_ERR = 2;
+
+ const CIRCPAD_MACHINE_CIRC_SETUP = 1;
+
+ struct circpad_negotiate {
+   u8 version IN [0];
+   u8 command IN [CIRCPAD_COMMAND_START, CIRCPAD_COMMAND_STOP];
+
+   u8 machine_type IN [CIRCPAD_MACHINE_CIRC_SETUP];
+ };
+
+  When a client wants to start a circuit padding machine, it first checks that
+  the desired destination hop advertises the appropriate subprotocol version 
for
+  that machine. It then sends a circpad_negotiate cell to that hop with
+  command=CIRCPAD_COMMAND_START, and machine_type=CIRCPAD_MACHINE_CIRC_SETUP 
(for
+  the circ setup machine, the destination hop is the second hop in the 
circuit).
+
+  When a relay receives a circpad_negotiate cell, it checks that it supports
+  the requested machine, and sends a circpad_negotiated cell, which is 
formatted
+  as follows:
+
+ struct circpad_negotiated {
+   u8 version IN [0];
+   u8 command IN [CIRCPAD_COMMAND_START, CIRCPAD_COMMAND_STOP];
+   u8 response IN [CIRCPAD_RESPONSE_OK, CIRCPAD_RESPONSE_ERR];
+
+   u8 machine_type IN [CIRCPAD_MACHINE_CIRC_SETUP];
+ };
+
+  If the machine is supported, the response field will contain
+

[tor-commits] [torspec/master] Remove "not done" and XXX about NSF numbers.

2019-09-19 Thread nickm

commit 2ebc16e26ceb2fd8fc6fe289f9adc1c14f79c8ce
Author: Mike Perry 
Date:   Thu Sep 19 14:05:13 2019 -0500

Remove "not done" and XXX about NSF numbers.

NSF-TTP number for circpad is already in there.
---
 padding-spec.txt | 4 
 1 file changed, 4 deletions(-)

diff --git a/padding-spec.txt b/padding-spec.txt
index 455c5eb..26366ad 100644
--- a/padding-spec.txt
+++ b/padding-spec.txt
@@ -10,8 +10,6 @@ various traffic patterns from external and internal 
observers. Other
 implementations MAY take other approaches, but implementors should be aware of
 the anonymity and load-balancing implications of their choices.
 
-  THIS SPEC ISN'T DONE YET.
-
   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL
   NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED",  "MAY", and
   "OPTIONAL" in this document are to be interpreted as described in
@@ -529,8 +527,6 @@ A. Acknowledgments
   This research was supported in part by NSF grants CNS-539,
   CNS-1314637, CNS-1526306, CNS-1619454, and CNS-1640548.
 
-  XXX: There's more CNS numbers now..
-
 1. https://en.wikipedia.org/wiki/NetFlow
 2. 
http://infodoc.alcatel-lucent.com/html/0_add-h-f/93-0073-10-01/7750_SR_OS_Router_Configuration_Guide/Cflowd-CLI.html
 3. 
http://www.cisco.com/en/US/docs/ios/12_3t/netflow/command/reference/nfl_a1gt_ps5207_TSD_Products_Command_Reference_Chapter.html#wp1185203



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

[tor-commits] [torspec/master] Link to circuit padding dev doc location.

2019-09-19 Thread nickm

commit 479f0dc4bd2a873ab153ed0e7d7066e975069929
Author: Mike Perry 
Date:   Thu Sep 19 14:10:51 2019 -0500

Link to circuit padding dev doc location.
---
 padding-spec.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/padding-spec.txt b/padding-spec.txt
index 26366ad..4c3c152 100644
--- a/padding-spec.txt
+++ b/padding-spec.txt
@@ -543,7 +543,7 @@ A. Acknowledgments
 14. http://www.ntop.org/wp-content/uploads/2013/03/nProbe_UserGuide.pdf
 15. http://arxiv.org/pdf/1512.00524
 16. https://www.cs.kau.se/pulls/hot/thebasketcase-ape/
-17. XXX-dev-doc
+17. 
https://github.com/torproject/tor/tree/master/doc/HACKING/CircuitPaddingDevelopment.md
 18. https://www.usenix.org/node/190967
 https://blog.torproject.org/technical-summary-usenix-fingerprinting-paper
 



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

[tor-commits] [torspec/master] Merge remote-tracking branch 'mikeperry-github/hs-padding-spec'

2019-09-19 Thread nickm

commit 3b41712498d407923061dda2b16bf9ea5a6b5bc4
Merge: 317d09b 479f0dc
Author: Nick Mathewson 
Date:   Thu Sep 19 15:30:02 2019 -0400

Merge remote-tracking branch 'mikeperry-github/hs-padding-spec'

 padding-spec.txt   | 266 -
 proposals/251-netflow-padding.txt  |   2 +-
 .../302-padding-machines-for-onion-clients.txt |   6 +-
 3 files changed, 265 insertions(+), 9 deletions(-)

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

[tor-commits] [community/master] Editflowandgrammar.lr

2019-09-19 Thread emmapeel

commit f96b32d918d75b76c86723ae7b38e7bd49eae6ed
Author: Stephanie A. Whited 
Date:   Thu Sep 19 16:17:56 2019 +

Editflowandgrammar.lr
---
 content/localization/contents.lr | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/content/localization/contents.lr b/content/localization/contents.lr
index ccdc74d..e356bc4 100644
--- a/content/localization/contents.lr
+++ b/content/localization/contents.lr
@@ -8,9 +8,9 @@ _template: layout.html
 ---
 title: Localization
 ---
-subtitle: We want Tor to work for everyone in the world, which means a lot of 
languages.
+subtitle: We want Tor to work for everyone in the world, which means our 
software must be translated into a lot of languages.
 ---
-cta: Help us to translate
+cta: Help us translate
 ---
 key: 2
 ---
@@ -22,4 +22,4 @@ body:
 
 In order for Tor to work for everyone, it needs to speak everyone's languages.
 Our volunteer translation team works hard to make this a reality, and we can 
always use more help.
-Our current translation priorities are translating the [Tor 
Browser](https://torpat.ch/locales), its documentation and the [Tor Project 
website](https://torpat.ch/tpo-locales), and there are always other documents 
to translate.
+Our current translation priorities are translating [Tor 
Browser](https://torpat.ch/locales), Tor Browser documentation, and the [Tor 
Project website](https://torpat.ch/tpo-locales), but there are many other 
documents that we could use help translating as well. 



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

[tor-commits] [community/master] trailing space

2019-09-19 Thread emmapeel

commit 6c4d1aba92d23a88ee60bca1490954bed1206203
Author: emma peel 
Date:   Thu Sep 19 18:49:39 2019 +0200

trailing space
---
 content/onion-services/overview/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/onion-services/overview/contents.lr 
b/content/onion-services/overview/contents.lr
index 869db5e..c85306f 100644
--- a/content/onion-services/overview/contents.lr
+++ b/content/onion-services/overview/contents.lr
@@ -20,7 +20,7 @@ Onion services are services that can only be accessed over 
Tor. Running an onion
 
 ## Why onion services?
 
-Onion services offer various privacy and security benefits to their users. 
+Onion services offer various privacy and security benefits to their users.
 
 ### Location hiding
 

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

[tor-commits] [community/master] FlowAndGrammarEdit.lr

2019-09-19 Thread emmapeel

commit 929778fb1e80405ebdf7e74c40d35d567e6d2d77
Author: Stephanie A. Whited 
Date:   Thu Sep 19 15:51:08 2019 +

FlowAndGrammarEdit.lr
---
 content/localization/current-status/contents.lr | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/content/localization/current-status/contents.lr 
b/content/localization/current-status/contents.lr
index 1f539df..e9131f6 100644
--- a/content/localization/current-status/contents.lr
+++ b/content/localization/current-status/contents.lr
@@ -16,14 +16,14 @@ html: two-columns-page.html
 ---
 body:
 
-We have some languages in very good shape, with a number of active and 
committed contributors (as French, Spanish, Russian, Portuguese). Even when the 
translations are finished, we always welcome more contributors to this 
languages.
+We have some languages in very good shape, with a number of active and 
committed contributors (as French, Spanish, Russian, Portuguese). Even when the 
translations are finished, you are still welcome to help us with these 
languages.
 
-We also have a lot of languages with incomplete translations, maybe spoken by 
less numbers of people, but still important to improve access to the Tor 
network for people that does not speak English.
+Our translations are incomplete for a lot of languages. They may be spoken by 
fewer people around the world, but it is still critical that we improve access 
to Tor for people who do not speak English.
 
-We are committed to provide translations to more languagues, please consider 
[helping with translations](/localization/becoming-tor-translator/) to your 
native language.
+Please consider [helping with 
translations](/localization/becoming-tor-translator/) in your native language.
 
-The most important languages we need help with at the moment are: Farsi 
(Persian), Arabic and Korean. But many other languages are being translated, as 
you can see here:
+Right now, we need the most help with Farsi (Persian), Arabic, and Korean. But 
many other languages are being translated, as you can see here:
 
 
 
-You can also see the open tickets about translation problems on our 
[bugtracker](https://trac.torproject.org/projects/tor/query?status=!closed=Community%2FTranslations).
+You can see the open tickets about translation problems on our 
[bugtracker](https://trac.torproject.org/projects/tor/query?status=!closed=Community%2FTranslations).

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

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

2019-09-19 Thread translation

commit 24bbd821bc477f2d83a04bece1cac471b9676461
Author: Translation commit bot 
Date:   Thu Sep 19 14:45:54 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties_completed
---
 es/exonerator.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/es/exonerator.properties b/es/exonerator.properties
index 611239f3c..03fb6f2c0 100644
--- a/es/exonerator.properties
+++ b/es/exonerator.properties
@@ -43,7 +43,7 @@ technicaldetails.exit.yes=SÃ
 technicaldetails.exit.no=No
 permanentlink.heading=Enlace permanente
 footer.abouttor.heading=Acerca de Tor
-footer.abouttor.body.text=Tor es un proyecto de software internacional para 
hacer anÃ³nimo el trÃ¡fico de Internet, cifrando paquetes y enviÃ¡ndolos a 
travÃ©s de una serie de saltos antes de que lleguen a su destination. Por 
lo tanto, si ves trÃ¡fico de un relÃ© de Tor, este trÃ¡fico generalmente lo 
origina alguien que usa Tor, en lugar de hacerlo por el operador del relÃ© 
operator. Los operadores de retransmisiÃ³n del Proyecto Tor y de Tor no 
tienen registros del trÃ¡fico que pasa por la red y, por lo tanto, no pueden 
proporcionar informaciÃ³n alguna sobre su origin. AsegÃºrate de%s, y no 
dudes en %s para mÃ¡s informaciÃ³n. 
+# footer.abouttor.body.text=Tor is an international software project to 
anonymize Internet traffic by encrypting packets and sending them through a 
series of hops before they reach their destination. Therefore, if you see 
traffic from a Tor relay, this traffic usually originates from someone using 
Tor, rather than from the relay operator. The Tor Project and Tor relay 
operators have no records of the traffic that passes over the network and 
therefore cannot provide any information about its origin. Be sure to %s, 
and don't hesitate to %s for more information.
 footer.abouttor.body.link1=aprende acerca de Tor
 footer.abouttor.body.link2=contacta con The Tor Project, Inc.
 footer.aboutexonerator.heading=Acerca de ExoneraTor

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

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

2019-09-19 Thread translation

commit 5457c121da31cecbfee7305a08a1d32b1ceda15e
Author: Translation commit bot 
Date:   Thu Sep 19 14:46:02 2019 +

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

diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd
index f366599c5..1cd7f741c 100644
--- a/es/https-everywhere.dtd
+++ b/es/https-everywhere.dtd
@@ -48,7 +48,7 @@
 
 
 
-
+
 
 
 

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

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

2019-09-19 Thread translation

commit cf0eaa159ba4cba896c0d99b5690750b719de1c6
Author: Translation commit bot 
Date:   Thu Sep 19 14:46:09 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
---
 es/https-everywhere.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd
index 726568a31..1cd7f741c 100644
--- a/es/https-everywhere.dtd
+++ b/es/https-everywhere.dtd
@@ -14,7 +14,7 @@
 
 
 
-
+
 
 
 
@@ -48,7 +48,7 @@
 
 
 
-
+
 
 
 

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

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

2019-09-19 Thread translation

commit b46decd7d164c7fabb62c099b70e12fbaca11bba
Author: Translation commit bot 
Date:   Thu Sep 19 14:45:48 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties
---
 es/exonerator.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/es/exonerator.properties b/es/exonerator.properties
index 611239f3c..795fe3bb9 100644
--- a/es/exonerator.properties
+++ b/es/exonerator.properties
@@ -43,7 +43,7 @@ technicaldetails.exit.yes=SÃ
 technicaldetails.exit.no=No
 permanentlink.heading=Enlace permanente
 footer.abouttor.heading=Acerca de Tor
-footer.abouttor.body.text=Tor es un proyecto de software internacional para 
hacer anÃ³nimo el trÃ¡fico de Internet, cifrando paquetes y enviÃ¡ndolos a 
travÃ©s de una serie de saltos antes de que lleguen a su destination. Por 
lo tanto, si ves trÃ¡fico de un relÃ© de Tor, este trÃ¡fico generalmente lo 
origina alguien que usa Tor, en lugar de hacerlo por el operador del relÃ© 
operator. Los operadores de retransmisiÃ³n del Proyecto Tor y de Tor no 
tienen registros del trÃ¡fico que pasa por la red y, por lo tanto, no pueden 
proporcionar informaciÃ³n alguna sobre su origin. AsegÃºrate de%s, y no 
dudes en %s para mÃ¡s informaciÃ³n. 
+footer.abouttor.body.text=Tor es un proyecto de software internacional para 
hacer anÃ³nimo el trÃ¡fico de Internet, cifrando paquetes y enviÃ¡ndolos a 
travÃ©s de una serie de saltos antes de que lleguen a su destination. Por 
lo tanto, si ves trÃ¡fico de un repetidor de Tor, este trÃ¡fico generalmente lo 
origina alguien que usa Tor, en lugar de hacerlo por el operador del repetidor 
operator. Los operadores de retransmisiÃ³n del Proyecto Tor y de Tor no 
tienen registros del trÃ¡fico que pasa por la red y, por lo tanto, no pueden 
proporcionar informaciÃ³n alguna sobre su origin. AsegÃºrate de%s, y no 
dudes en %s para mÃ¡s informaciÃ³n. 
 footer.abouttor.body.link1=aprende acerca de Tor
 footer.abouttor.body.link2=contacta con The Tor Project, Inc.
 footer.aboutexonerator.heading=Acerca de ExoneraTor

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

[tor-commits] [metrics-web/master] Re-add recent bridge pool assignments.

2019-09-19 Thread karsten

commit 7ccae10c5c171d363d907dd74736d51d89725748
Author: Karsten Loesing 
Date:   Thu Sep 19 16:30:16 2019 +0200

Re-add recent bridge pool assignments.
---
 src/main/resources/web/jsps/collector.jsp | 9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/web/jsps/collector.jsp 
b/src/main/resources/web/jsps/collector.jsp
index 42280a9..102bcab 100644
--- a/src/main/resources/web/jsps/collector.jsp
+++ b/src/main/resources/web/jsps/collector.jsp
@@ -158,7 +158,8 @@
 
   Bridge Pool Assignments
   @type bridge-pool-assignment 1.0
-   archive
+   recent
+   archive
 
 
   TorDNSEL's Exit Lists
@@ -573,6 +574,7 @@ statistical analysis.
 
 Bridge Pool Assignments
 @type bridge-pool-assignment 1.0
+ recent
  archive
 #
 
@@ -613,11 +615,6 @@ bridge-pool-assignment 2011-03-13 14:38:03
 [...]
 
 
-
-As of December 8, 2014, bridge pool assignment files are no longer
-archived.
-
-
 
 TorDNSEL's Exit Lists
 #

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

[tor-commits] [collector/master] Bump version to 1.11.1-dev.

2019-09-19 Thread karsten

commit 18877fdb4d270a6ef02664eb07271c064fab785f
Author: Karsten Loesing 
Date:   Thu Sep 19 15:11:37 2019 +0200

Bump version to 1.11.1-dev.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 9f2a0a6..6b097a3 100644
--- a/build.xml
+++ b/build.xml
@@ -9,7 +9,7 @@
 
   
   
-  
+  
   
   
   

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

[tor-commits] [collector/release] Fix bridge pool assignments sync and log statement.

2019-09-19 Thread karsten

commit 8ed8de6e76e0f45f6112f3d60597037bdf27493f
Author: Karsten Loesing 
Date:   Thu Sep 19 14:57:15 2019 +0200

Fix bridge pool assignments sync and log statement.
---
 CHANGELOG.md | 2 ++
 .../collector/bridgepools/BridgePoolAssignmentsProcessor.java| 5 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6992c9..48eae33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
  * Minor changes
- Update create-tarballs.sh to also produce bridge pool assignments
  tarballs.
+   - Fix synchronization part of newly re-added bridge pool
+ assignments module.
 
 
 # Changes in version 1.11.0 - 2019-09-19
diff --git 
a/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java
 
b/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java
index a386fb6..875273d 100644
--- 
a/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java
+++ 
b/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java
@@ -3,6 +3,7 @@
 
 package org.torproject.metrics.collector.bridgepools;
 
+import org.torproject.descriptor.BridgePoolAssignment;
 import org.torproject.metrics.collector.conf.Configuration;
 import org.torproject.metrics.collector.conf.ConfigurationException;
 import org.torproject.metrics.collector.conf.Key;
@@ -79,6 +80,8 @@ public class BridgePoolAssignmentsProcessor extends 
CollecTorMain {
*/
   public BridgePoolAssignmentsProcessor(Configuration config) {
 super(config);
+this.mapPathDescriptors.put("recent/bridge-pool-assignments",
+BridgePoolAssignment.class);
   }
 
   /**
@@ -153,7 +156,7 @@ public class BridgePoolAssignmentsProcessor extends 
CollecTorMain {
   }
 }
 if (null != latestPublished
-&& latestPublished.minusMinutes(330L).isBefore(LocalDateTime.now())) {
+&& latestPublished.plusMinutes(330L).isBefore(LocalDateTime.now())) {
   logger.warn("The last known bridge pool assignment list was "
   + "published at {}, which is more than 5:30 hours in the past.",
   latestPublished);



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

[tor-commits] [collector/release] Update create-tarballs.sh script and PROTOCOL.

2019-09-19 Thread karsten

commit d3203ceb9e726d641ea1a2621ff325873b7d6d45
Author: Karsten Loesing 
Date:   Thu Sep 19 12:37:18 2019 +0200

Update create-tarballs.sh script and PROTOCOL.

These changes still belong to archiving bridge pool assignments. But
they're not important enough for putting out a new release at this
point.
---
 CHANGELOG.md  | 7 +++
 src/main/resources/create-tarballs.sh | 7 +++
 src/main/resources/docs/PROTOCOL  | 5 +
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5f9488..d6992c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# Changes in version 1.??.? - 2019-??-??
+
+ * Minor changes
+   - Update create-tarballs.sh to also produce bridge pool assignments
+ tarballs.
+
+
 # Changes in version 1.11.0 - 2019-09-19
 
  * Medium changes
diff --git a/src/main/resources/create-tarballs.sh 
b/src/main/resources/create-tarballs.sh
index 50b7fdb..5802020 100755
--- a/src/main/resources/create-tarballs.sh
+++ b/src/main/resources/create-tarballs.sh
@@ -61,6 +61,8 @@ TARBALLS=(
   bridge-extra-infos-$YEARTWO-$MONTHTWO
   snowflakes-$YEARONE-$MONTHONE
   snowflakes-$YEARTWO-$MONTHTWO
+  bridge-pool-assignments-$YEARONE-$MONTHONE
+  bridge-pool-assignments-$YEARTWO-$MONTHTWO
 )
 TARBALLS=($(printf "%s\n" "${TARBALLS[@]}" | uniq))
 
@@ -90,6 +92,8 @@ DIRECTORIES=(
   $OUTDIR/bridge-descriptors/$YEARTWO/$MONTHTWO/extra-infos/
   $OUTDIR/snowflakes/$YEARONE/$MONTHONE/
   $OUTDIR/snowflakes/$YEARTWO/$MONTHTWO/
+  $OUTDIR/bridge-pool-assignments/$YEARONE/$MONTHONE/
+  $OUTDIR/bridge-pool-assignments/$YEARTWO/$MONTHTWO/
 )
 DIRECTORIES=($(printf "%s\n" "${DIRECTORIES[@]}" | uniq))
 
@@ -176,4 +180,7 @@ ln -f -s -t $ARCHIVEDIR/webstats/ 
$TARBALLTARGETDIR/webstats-20??-??.tar
 mkdir -p $ARCHIVEDIR/snowflakes/
 ln -f -s -t $ARCHIVEDIR/snowflakes/ $TARBALLTARGETDIR/snowflakes-20??-??.tar.xz
 
+mkdir -p $ARCHIVEDIR/bridge-pool-assignments/
+ln -f -s -t $ARCHIVEDIR/bridge-pool-assignments/ 
$TARBALLTARGETDIR/bridge-pool-assignments-20??-??.tar.xz
+
 echo `date` "Finished."
diff --git a/src/main/resources/docs/PROTOCOL b/src/main/resources/docs/PROTOCOL
index 478f168..d735d40 100644
--- a/src/main/resources/docs/PROTOCOL
+++ b/src/main/resources/docs/PROTOCOL
@@ -282,15 +282,12 @@
The top level of subdirectories is
 
* bridge-descriptors
+   * bridge-pool-assignments
* exit-lists
* relay-descriptors
* torperf
* snowflakes
 
-   (There has been another subdirectory 'bridge-pool-assignments' which has 
been
-   removed when CollecTor stopped collecting those descriptors.  However, it's
-   structure can still be found in the tarballs.)
-
 5.1 'exit-lists' and 'torperf' Tars
 
 5.1.1



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

[tor-commits] [collector/release] Prepare for 1.11.1 release.

2019-09-19 Thread karsten

commit 91e5a07df83f4432043afe13ad221d8d8992c176
Author: Karsten Loesing 
Date:   Thu Sep 19 15:00:00 2019 +0200

Prepare for 1.11.1 release.
---
 CHANGELOG.md | 2 +-
 build.xml| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48eae33..e30b086 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Changes in version 1.??.? - 2019-??-??
+# Changes in version 1.11.1 - 2019-09-19
 
  * Minor changes
- Update create-tarballs.sh to also produce bridge pool assignments
diff --git a/build.xml b/build.xml
index da10311..9f2a0a6 100644
--- a/build.xml
+++ b/build.xml
@@ -9,7 +9,7 @@
 
   
   
-  
+  
   
   
   

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

[tor-commits] [collector/release] Bump version to 1.11.0-dev.

2019-09-19 Thread karsten

commit cb6e85d79a8622248a68166ae9cd87febcbd0b45
Author: Karsten Loesing 
Date:   Thu Sep 19 11:32:29 2019 +0200

Bump version to 1.11.0-dev.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index faf44a9..da10311 100644
--- a/build.xml
+++ b/build.xml
@@ -9,7 +9,7 @@
 
   
   
-  
+  
   
   
   



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

[tor-commits] [collector/master] Fix bridge pool assignments sync and log statement.

2019-09-19 Thread karsten

commit 8ed8de6e76e0f45f6112f3d60597037bdf27493f
Author: Karsten Loesing 
Date:   Thu Sep 19 14:57:15 2019 +0200

Fix bridge pool assignments sync and log statement.
---
 CHANGELOG.md | 2 ++
 .../collector/bridgepools/BridgePoolAssignmentsProcessor.java| 5 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6992c9..48eae33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
  * Minor changes
- Update create-tarballs.sh to also produce bridge pool assignments
  tarballs.
+   - Fix synchronization part of newly re-added bridge pool
+ assignments module.
 
 
 # Changes in version 1.11.0 - 2019-09-19
diff --git 
a/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java
 
b/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java
index a386fb6..875273d 100644
--- 
a/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java
+++ 
b/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java
@@ -3,6 +3,7 @@
 
 package org.torproject.metrics.collector.bridgepools;
 
+import org.torproject.descriptor.BridgePoolAssignment;
 import org.torproject.metrics.collector.conf.Configuration;
 import org.torproject.metrics.collector.conf.ConfigurationException;
 import org.torproject.metrics.collector.conf.Key;
@@ -79,6 +80,8 @@ public class BridgePoolAssignmentsProcessor extends 
CollecTorMain {
*/
   public BridgePoolAssignmentsProcessor(Configuration config) {
 super(config);
+this.mapPathDescriptors.put("recent/bridge-pool-assignments",
+BridgePoolAssignment.class);
   }
 
   /**
@@ -153,7 +156,7 @@ public class BridgePoolAssignmentsProcessor extends 
CollecTorMain {
   }
 }
 if (null != latestPublished
-&& latestPublished.minusMinutes(330L).isBefore(LocalDateTime.now())) {
+&& latestPublished.plusMinutes(330L).isBefore(LocalDateTime.now())) {
   logger.warn("The last known bridge pool assignment list was "
   + "published at {}, which is more than 5:30 hours in the past.",
   latestPublished);



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

[tor-commits] [collector/master] Prepare for 1.11.1 release.

2019-09-19 Thread karsten

commit 91e5a07df83f4432043afe13ad221d8d8992c176
Author: Karsten Loesing 
Date:   Thu Sep 19 15:00:00 2019 +0200

Prepare for 1.11.1 release.
---
 CHANGELOG.md | 2 +-
 build.xml| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48eae33..e30b086 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Changes in version 1.??.? - 2019-??-??
+# Changes in version 1.11.1 - 2019-09-19
 
  * Minor changes
- Update create-tarballs.sh to also produce bridge pool assignments
diff --git a/build.xml b/build.xml
index da10311..9f2a0a6 100644
--- a/build.xml
+++ b/build.xml
@@ -9,7 +9,7 @@
 
   
   
-  
+  
   
   
   

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

[tor-commits] [tor/maint-0.4.1] bump to 0.4.1.6-dev

2019-09-19 Thread nickm

commit 6f3f93d86c03a7e38e6ba5b64e487aebcd0642bc
Author: Nick Mathewson 
Date:   Thu Sep 19 08:52:15 2019 -0400

bump to 0.4.1.6-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 93772874e..7bdd195e6 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.1.6])
+AC_INIT([tor],[0.4.1.6-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # 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, ["2019-09-17"], # for 0.4.1.6
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-09-19"], # for 0.4.1.6-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 ebae132d0..32f7692f1 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.1.6"
+!define VERSION "0.4.1.6-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 e9a04e27d..78370ae0a 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.1.6"
+#define VERSION "0.4.1.6-dev"
 
 
 

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

[tor-commits] [tor/release-0.4.1] bump to 0.4.1.6-dev

2019-09-19 Thread nickm

commit 6f3f93d86c03a7e38e6ba5b64e487aebcd0642bc
Author: Nick Mathewson 
Date:   Thu Sep 19 08:52:15 2019 -0400

bump to 0.4.1.6-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 93772874e..7bdd195e6 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.1.6])
+AC_INIT([tor],[0.4.1.6-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # 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, ["2019-09-17"], # for 0.4.1.6
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-09-19"], # for 0.4.1.6-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 ebae132d0..32f7692f1 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.1.6"
+!define VERSION "0.4.1.6-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 e9a04e27d..78370ae0a 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.1.6"
+#define VERSION "0.4.1.6-dev"
 
 
 



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

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

2019-09-19 Thread nickm

commit 124d8ec7b21e9afb4d2e6d739c267b7573cc740a
Merge: c752b1b43 6f3f93d86
Author: Nick Mathewson 
Date:   Thu Sep 19 08:52:59 2019 -0400

Merge branch 'maint-0.4.1' into release-0.4.1

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

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

[tor-commits] [tor/master] bump to 0.4.1.6-dev

2019-09-19 Thread nickm

commit 6f3f93d86c03a7e38e6ba5b64e487aebcd0642bc
Author: Nick Mathewson 
Date:   Thu Sep 19 08:52:15 2019 -0400

bump to 0.4.1.6-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 93772874e..7bdd195e6 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.1.6])
+AC_INIT([tor],[0.4.1.6-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # 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, ["2019-09-17"], # for 0.4.1.6
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-09-19"], # for 0.4.1.6-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 ebae132d0..32f7692f1 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.1.6"
+!define VERSION "0.4.1.6-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 e9a04e27d..78370ae0a 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.1.6"
+#define VERSION "0.4.1.6-dev"
 
 
 



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

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

2019-09-19 Thread nickm

commit e6c5b248aea3e70e78e60648b10b30daa14f0802
Merge: b01bd73d9 6f3f93d86
Author: Nick Mathewson 
Date:   Thu Sep 19 08:52:42 2019 -0400

Merge branch 'maint-0.4.1'

"ours" to avoid version bump

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

[tor-commits] [tor/master] Copy 0.4.1.6 block into changelog/releasenotes in master

2019-09-19 Thread nickm

commit b01bd73d92d59f5ec58d9944b1dfe0a173192ed7
Author: Nick Mathewson 
Date:   Thu Sep 19 08:38:50 2019 -0400

Copy 0.4.1.6 block into changelog/releasenotes in master
---
 ChangeLog| 79 
 ReleaseNotes | 79 
 2 files changed, 158 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 0c1191bac..938e91545 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,82 @@
+Changes in version 0.4.1.6 - 2019-09-19
+  This release backports several bugfixes to improve stability and
+  correctness.  Anyone experiencing build problems or crashes with 0.4.1.5,
+  or experiencing reliability issues with single onion services, should
+  upgrade.
+
+  o Major bugfixes (crash, Linux, Android, backport from 0.4.2.1-alpha):
+- Tolerate systems (including some Android installations) where
+  madvise and MADV_DONTDUMP are available at build-time, but not at
+  run time. Previously, these systems would notice a failed syscall
+  and abort. Fixes bug 31570; bugfix on 0.4.1.1-alpha.
+- Tolerate systems (including some Linux installations) where
+  madvise and/or MADV_DONTFORK are available at build-time, but not
+  at run time. Previously, these systems would notice a failed
+  syscall and abort. Fixes bug 31696; bugfix on 0.4.1.1-alpha.
+
+  o Minor features (stem tests, backport from 0.4.2.1-alpha):
+- Change "make test-stem" so it only runs the stem tests that use
+  tor. This change makes test-stem faster and more reliable. Closes
+  ticket 31554.
+
+  o Minor bugfixes (build system, backport form 0.4.2.1-alpha):
+- Do not include the deprecated  on Linux or Windows
+  systems. Fixes bug 31673; bugfix on 0.2.5.4-alpha.
+
+  o Minor bugfixes (compilation, backport from 0.4.2.1-alpha):
+- Add more stub functions to fix compilation on Android with link-
+  time optimization when --disable-module-dirauth is used.
+  Previously, these compilation settings would make the compiler
+  look for functions that didn't exist. Fixes bug 31552; bugfix
+  on 0.4.1.1-alpha.
+- Suppress spurious float-conversion warnings from GCC when calling
+  floating-point classifier functions on FreeBSD. Fixes part of bug
+  31687; bugfix on 0.3.1.5-alpha.
+
+  o Minor bugfixes (controller protocol):
+- Fix the MAPADDRESS controller command to accept one or more
+  arguments. Previously, it required two or more arguments, and ignored
+  the first. Fixes bug 31772; bugfix on 0.4.1.1-alpha.
+
+  o Minor bugfixes (guards, backport from 0.4.2.1-alpha):
+- When tor is missing descriptors for some primary entry guards,
+  make the log message less alarming. It's normal for descriptors to
+  expire, as long as tor fetches new ones soon after. Fixes bug
+  31657; bugfix on 0.3.3.1-alpha.
+
+  o Minor bugfixes (logging, backport from 0.4.2.1-alpha):
+- Change log level of message "Hash of session info was not as
+  expected" to LOG_PROTOCOL_WARN. Fixes bug 12399; bugfix
+  on 0.1.1.10-alpha.
+
+  o Minor bugfixes (rust, backport from 0.4.2.1-alpha):
+- Correctly exclude a redundant rust build job in Travis. Fixes bug
+  31463; bugfix on 0.3.5.4-alpha.
+
+  o Minor bugfixes (v2 single onion services, backport from 0.4.2.1-alpha):
+- Always retry v2 single onion service intro and rend circuits with
+  a 3-hop path. Previously, v2 single onion services used a 3-hop
+  path when rendezvous circuits were retried after a remote or
+  delayed failure, but a 1-hop path for immediate retries. Fixes bug
+  23818; bugfix on 0.2.9.3-alpha.
+
+  o Minor bugfixes (v3 single onion services, backport from 0.4.2.1-alpha):
+- Always retry v3 single onion service intro and rend circuits with
+  a 3-hop path. Previously, v3 single onion services used a 3-hop
+  path when rend circuits were retried after a remote or delayed
+  failure, but a 1-hop path for immediate retries. Fixes bug 23818;
+  bugfix on 0.3.2.1-alpha.
+- Make v3 single onion services fall back to a 3-hop intro, when all
+  intro points are unreachable via a 1-hop path. Previously, v3
+  single onion services failed when all intro nodes were unreachable
+  via a 1-hop path. Fixes bug 23507; bugfix on 0.3.2.1-alpha.
+
+  o Documentation (backport from 0.4.2.1-alpha):
+- Use RFC 2397 data URL scheme to embed an image into tor-exit-
+  notice.html so that operators no longer have to host it
+  themselves. Closes ticket 31089.
+
+
 Changes in version 0.4.2.1-alpha - 2019-09-17
   This is the first alpha release in the 0.4.2.x series. It adds new
   defenses for denial-of-service attacks against onion services. It also
diff --git a/ReleaseNotes b/ReleaseNotes
index 60fcdd450..8b7dd18ba 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,85 @@ This document summarizes new features and bugfixes in

[tor-commits] [tor/release-0.4.1] copy 0.4.1.6 block into releasenotes

2019-09-19 Thread nickm

commit c752b1b43a8f5a0024842361da84f54d938b9cea
Author: Nick Mathewson 
Date:   Thu Sep 19 08:38:05 2019 -0400

copy 0.4.1.6 block into releasenotes
---
 ReleaseNotes | 79 
 1 file changed, 79 insertions(+)

diff --git a/ReleaseNotes b/ReleaseNotes
index 60fcdd450..8b7dd18ba 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,85 @@ This document summarizes new features and bugfixes in each 
stable
 release of Tor. If you want to see more detailed descriptions of the
 changes in each development snapshot, see the ChangeLog file.
 
+Changes in version 0.4.1.6 - 2019-09-19
+  This release backports several bugfixes to improve stability and
+  correctness.  Anyone experiencing build problems or crashes with 0.4.1.5,
+  or experiencing reliability issues with single onion services, should
+  upgrade.
+
+  o Major bugfixes (crash, Linux, Android, backport from 0.4.2.1-alpha):
+- Tolerate systems (including some Android installations) where
+  madvise and MADV_DONTDUMP are available at build-time, but not at
+  run time. Previously, these systems would notice a failed syscall
+  and abort. Fixes bug 31570; bugfix on 0.4.1.1-alpha.
+- Tolerate systems (including some Linux installations) where
+  madvise and/or MADV_DONTFORK are available at build-time, but not
+  at run time. Previously, these systems would notice a failed
+  syscall and abort. Fixes bug 31696; bugfix on 0.4.1.1-alpha.
+
+  o Minor features (stem tests, backport from 0.4.2.1-alpha):
+- Change "make test-stem" so it only runs the stem tests that use
+  tor. This change makes test-stem faster and more reliable. Closes
+  ticket 31554.
+
+  o Minor bugfixes (build system, backport form 0.4.2.1-alpha):
+- Do not include the deprecated  on Linux or Windows
+  systems. Fixes bug 31673; bugfix on 0.2.5.4-alpha.
+
+  o Minor bugfixes (compilation, backport from 0.4.2.1-alpha):
+- Add more stub functions to fix compilation on Android with link-
+  time optimization when --disable-module-dirauth is used.
+  Previously, these compilation settings would make the compiler
+  look for functions that didn't exist. Fixes bug 31552; bugfix
+  on 0.4.1.1-alpha.
+- Suppress spurious float-conversion warnings from GCC when calling
+  floating-point classifier functions on FreeBSD. Fixes part of bug
+  31687; bugfix on 0.3.1.5-alpha.
+
+  o Minor bugfixes (controller protocol):
+- Fix the MAPADDRESS controller command to accept one or more
+  arguments. Previously, it required two or more arguments, and ignored
+  the first. Fixes bug 31772; bugfix on 0.4.1.1-alpha.
+
+  o Minor bugfixes (guards, backport from 0.4.2.1-alpha):
+- When tor is missing descriptors for some primary entry guards,
+  make the log message less alarming. It's normal for descriptors to
+  expire, as long as tor fetches new ones soon after. Fixes bug
+  31657; bugfix on 0.3.3.1-alpha.
+
+  o Minor bugfixes (logging, backport from 0.4.2.1-alpha):
+- Change log level of message "Hash of session info was not as
+  expected" to LOG_PROTOCOL_WARN. Fixes bug 12399; bugfix
+  on 0.1.1.10-alpha.
+
+  o Minor bugfixes (rust, backport from 0.4.2.1-alpha):
+- Correctly exclude a redundant rust build job in Travis. Fixes bug
+  31463; bugfix on 0.3.5.4-alpha.
+
+  o Minor bugfixes (v2 single onion services, backport from 0.4.2.1-alpha):
+- Always retry v2 single onion service intro and rend circuits with
+  a 3-hop path. Previously, v2 single onion services used a 3-hop
+  path when rendezvous circuits were retried after a remote or
+  delayed failure, but a 1-hop path for immediate retries. Fixes bug
+  23818; bugfix on 0.2.9.3-alpha.
+
+  o Minor bugfixes (v3 single onion services, backport from 0.4.2.1-alpha):
+- Always retry v3 single onion service intro and rend circuits with
+  a 3-hop path. Previously, v3 single onion services used a 3-hop
+  path when rend circuits were retried after a remote or delayed
+  failure, but a 1-hop path for immediate retries. Fixes bug 23818;
+  bugfix on 0.3.2.1-alpha.
+- Make v3 single onion services fall back to a 3-hop intro, when all
+  intro points are unreachable via a 1-hop path. Previously, v3
+  single onion services failed when all intro nodes were unreachable
+  via a 1-hop path. Fixes bug 23507; bugfix on 0.3.2.1-alpha.
+
+  o Documentation (backport from 0.4.2.1-alpha):
+- Use RFC 2397 data URL scheme to embed an image into tor-exit-
+  notice.html so that operators no longer have to host it
+  themselves. Closes ticket 31089.
+
+
 Changes in version 0.4.1.5 - 2019-08-20
   This is the first stable release in the 0.4.1.x series. This series
   adds experimental circuit-level padding, authenticated SENDME cells to

___
tor-commits mailing list

[tor-commits] [tpo/master] Stable is now 0.4.1.6

2019-09-19 Thread nickm

commit 0de1273103d25e05a4cbef657c038382f312a3f5
Author: Nick Mathewson 
Date:   Thu Sep 19 08:36:24 2019 -0400

Stable is now 0.4.1.6
---
 databags/versions.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/databags/versions.ini b/databags/versions.ini
index 41d128c..e59162f 100644
--- a/databags/versions.ini
+++ b/databags/versions.ini
@@ -9,7 +9,7 @@ version = 8.5.6
 version = 9.0a6
 
 [tor-stable]
-version = 0.4.1.5
+version = 0.4.1.6
 
 [tor-alpha]
 version = 0.4.2.1-alpha

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

[tor-commits] [tor/release-0.4.1] Set the date for the 0.4.1.6 release.

2019-09-19 Thread nickm

commit d10abc0929f4941d564b72a349aaf421aaa268f3
Author: Nick Mathewson 
Date:   Thu Sep 19 08:08:39 2019 -0400

Set the date for the 0.4.1.6 release.
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 71a889626..8f1af1258 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.4.1.6 - 2019-09-??
+Changes in version 0.4.1.6 - 2019-09-19
   This release backports several bugfixes to improve stability and
   correctness.  Anyone experiencing build problems or crashes with 0.4.1.5,
   or experiencing reliability issues with single onion services, should

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

[tor-commits] [collector/master] Update create-tarballs.sh script and PROTOCOL.

2019-09-19 Thread karsten

commit d3203ceb9e726d641ea1a2621ff325873b7d6d45
Author: Karsten Loesing 
Date:   Thu Sep 19 12:37:18 2019 +0200

Update create-tarballs.sh script and PROTOCOL.

These changes still belong to archiving bridge pool assignments. But
they're not important enough for putting out a new release at this
point.
---
 CHANGELOG.md  | 7 +++
 src/main/resources/create-tarballs.sh | 7 +++
 src/main/resources/docs/PROTOCOL  | 5 +
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5f9488..d6992c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# Changes in version 1.??.? - 2019-??-??
+
+ * Minor changes
+   - Update create-tarballs.sh to also produce bridge pool assignments
+ tarballs.
+
+
 # Changes in version 1.11.0 - 2019-09-19
 
  * Medium changes
diff --git a/src/main/resources/create-tarballs.sh 
b/src/main/resources/create-tarballs.sh
index 50b7fdb..5802020 100755
--- a/src/main/resources/create-tarballs.sh
+++ b/src/main/resources/create-tarballs.sh
@@ -61,6 +61,8 @@ TARBALLS=(
   bridge-extra-infos-$YEARTWO-$MONTHTWO
   snowflakes-$YEARONE-$MONTHONE
   snowflakes-$YEARTWO-$MONTHTWO
+  bridge-pool-assignments-$YEARONE-$MONTHONE
+  bridge-pool-assignments-$YEARTWO-$MONTHTWO
 )
 TARBALLS=($(printf "%s\n" "${TARBALLS[@]}" | uniq))
 
@@ -90,6 +92,8 @@ DIRECTORIES=(
   $OUTDIR/bridge-descriptors/$YEARTWO/$MONTHTWO/extra-infos/
   $OUTDIR/snowflakes/$YEARONE/$MONTHONE/
   $OUTDIR/snowflakes/$YEARTWO/$MONTHTWO/
+  $OUTDIR/bridge-pool-assignments/$YEARONE/$MONTHONE/
+  $OUTDIR/bridge-pool-assignments/$YEARTWO/$MONTHTWO/
 )
 DIRECTORIES=($(printf "%s\n" "${DIRECTORIES[@]}" | uniq))
 
@@ -176,4 +180,7 @@ ln -f -s -t $ARCHIVEDIR/webstats/ 
$TARBALLTARGETDIR/webstats-20??-??.tar
 mkdir -p $ARCHIVEDIR/snowflakes/
 ln -f -s -t $ARCHIVEDIR/snowflakes/ $TARBALLTARGETDIR/snowflakes-20??-??.tar.xz
 
+mkdir -p $ARCHIVEDIR/bridge-pool-assignments/
+ln -f -s -t $ARCHIVEDIR/bridge-pool-assignments/ 
$TARBALLTARGETDIR/bridge-pool-assignments-20??-??.tar.xz
+
 echo `date` "Finished."
diff --git a/src/main/resources/docs/PROTOCOL b/src/main/resources/docs/PROTOCOL
index 478f168..d735d40 100644
--- a/src/main/resources/docs/PROTOCOL
+++ b/src/main/resources/docs/PROTOCOL
@@ -282,15 +282,12 @@
The top level of subdirectories is
 
* bridge-descriptors
+   * bridge-pool-assignments
* exit-lists
* relay-descriptors
* torperf
* snowflakes
 
-   (There has been another subdirectory 'bridge-pool-assignments' which has 
been
-   removed when CollecTor stopped collecting those descriptors.  However, it's
-   structure can still be found in the tarballs.)
-
 5.1 'exit-lists' and 'torperf' Tars
 
 5.1.1

___
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

2019-09-19 Thread translation

commit 7814143a5cd87fbff40e138cc06f8a4831164b47
Author: Translation commit bot 
Date:   Thu Sep 19 09:49:49 2019 +

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

diff --git a/contents+fa.po b/contents+fa.po
index b06f2faed..c8c1307ff 100644
--- a/contents+fa.po
+++ b/contents+fa.po
@@ -2294,7 +2294,7 @@ msgstr "* ÙØÙ Ù¾ÙØ´Ù ÙØ±ÙØ±Ú¯Ø± ØªÙØ± ÛØ§ ÙØ±Ù 
Ø§ÙØ²Ø§Ø± Ø±Ø§ ØØ°Ù
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid "* Empty your Trash."
-msgstr "* Ø²Ø¨Ø§ÙÙ ÙØ§Û Ø®ÙØ¯ Ø±Ø§ Ø®Ø§ÙÛ Ú©ÙÛØ¯."
+msgstr "* Ø³Ø·Ù Ø²Ø¨Ø§ÙÙ Ø®ÙØ¯ Ø±Ø§ Ø®Ø§ÙÛ Ú©ÙÛØ¯."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
@@ -2313,7 +2313,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid "* Move the Tor Browser application to Trash."
-msgstr "* Ø¨Ø±ÙØ§ÙÙ ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ø±Ø§ ØØ°Ù Ú©ÙÛØ¯."
+msgstr "* Ø¨Ø±ÙØ§ÙÙ ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ø±Ø§ Ø¨Ù Ø³Ø·Ù Ø²Ø¨Ø§ÙÙ Ù
ÙØªÙÙ Ú©ÙÛØ¯."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
@@ -2360,6 +2360,8 @@ msgstr ""
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid "* Locate the TorBrowser-Data folder and move it to Trash."
 msgstr ""
+"* Ù¾ÙØ´Ù Data Ø±Ø§ Ø¯Ø± ÙØÙ ÙØµØ¨ ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ù¾ÛØ¯Ø§ Ú©Ø±Ø¯Ù 
Ù Ø¢Ù Ø±Ø§ Ø¨Ù Ø³Ø·Ù Ø²Ø¨Ø§ÙÙ ÙÙØªÙÙ "
+"Ú©ÙÛØ¯."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
@@ -2369,11 +2371,15 @@ msgid ""
 "`~/Library/Application Support/` folder, but in the same folder where you "
 "installed Tor Browser."
 msgstr ""
+"ØªÙØ¬Ù Ø¯Ø§Ø´ØªÙ Ø¨Ø§Ø´ÛØ¯ Ú©Ù Ø§Ú¯Ø± ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ø±Ø§ Ø¯Ø± Ù
ØÙ Ù¾ÛØ´ ÙØ±Ø¶(Ù¾ÙØ´Ù Applications) ÙØµØ¨ "
+"ÙÚ©Ø±Ø¯Ù Ø¨Ø§Ø´ÛØ¯Ø Ø¯Ø± Ø§ÛÙ ØµÙØ±Øª Ù¾ÙØ´Ù Data ÙØ±ÙØ±Ú¯Ø± 
ØªÙØ± Ø¯Ø± ÙØ´Ø§ÙÛ "
+"`~/Library/Application Support/` ÙØ±Ø§Ø± ÙØ®ÙØ§ÙØ¯ Ø¯Ø§Ø´ØªØ Ø¨ÙÚ©Ù 
Ø¯Ø± ÙÙØ§Ù Ù¾ÙØ´Ù Ø§Û Ø§Ø³Øª "
+"Ú©Ù ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ø±Ø§ ÙØµØ¨ Ú©Ø±Ø¯Ù Ø§ÛØ¯."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid "On Linux:"
-msgstr ""
+msgstr "Ø¯Ø± ÙÛÙÙÚ©Ø³:"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
@@ -2382,11 +2388,14 @@ msgid ""
 "however the folder will be named \"tor-browser_en-US\" if you are running "
 "the English Tor Browser."
 msgstr ""
+"* Ù¾ÙØ´Ù ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ø±Ø§ Ù¾ÛØ¯Ø§ Ú©ÙÛØ¯. Ø¯Ø± ÙÛÙÙÚ©Ø³Ø Ù
ØÙ Ù¾ÛØ´ ÙØ±Ø¶Û Ø¨Ø±Ø§Û ÙØµØ¨ ÙØ±ÙØ±Ú¯Ø± "
+"ØªØ¹ÛÛÙ ÙØ´Ø¯Ù Ø§Ø³ØªØ Ø¨Ø§ Ø§ÛÙ ØØ§ÙØ Ø§Ú¯Ø± Ø§Ø² ÙØ³Ø®Ù 
Ø§ÙÚ¯ÙÛØ³Û ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ø§Ø³ØªÙØ§Ø¯Ù ÙÛ Ú©ÙÛØ¯Ø "
+"ÙØ§Ù Ù¾ÙØ´Ù Ø¨Ù ØµÙØ±Øª \"tor-browser_en-US\" ÙÛ Ø¨Ø§Ø´Ø¯."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid "* Delete the Tor Browser folder."
-msgstr ""
+msgstr "* Ù¾ÙØ´Ù ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ø±Ø§ ØØ°Ù Ú©ÙÛØ¯."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
@@ -2394,6 +2403,8 @@ msgid ""
 "Note that your operating systemâs standard \"Uninstall\" utility is not "
 "used."
 msgstr ""
+"ØªÙØ¬Ù Ø¯Ø§Ø´ØªÙ Ø¨Ø§Ø´ÛØ¯ Ú©Ù Ø¨Ø±Ø§Û ØØ°Ù Ø¨Ø±ÙØ§ÙÙØ Ø§Ø² 
Ø§Ø¨Ø²Ø§Ø± \"Uninstall\" Ø§Ø³ØªØ§ÙØ¯Ø§Ø±Ø¯ Ø³ÛØ³ØªÙ "
+"Ø¹Ø§ÙÙ Ø§Ø³ØªÙØ§Ø¯Ù ÙÙÛ Ø´ÙØ¯."
 
 #: lego/templates/footer.html:9 lego/templates/footer.html:18
 #: lego/templates/navbar.html:71 templates/footer.html:9

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

[tor-commits] [collector/master] Bump version to 1.11.0-dev.

2019-09-19 Thread karsten

commit cb6e85d79a8622248a68166ae9cd87febcbd0b45
Author: Karsten Loesing 
Date:   Thu Sep 19 11:32:29 2019 +0200

Bump version to 1.11.0-dev.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index faf44a9..da10311 100644
--- a/build.xml
+++ b/build.xml
@@ -9,7 +9,7 @@
 
   
   
-  
+  
   
   
   

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

[tor-commits] [collector/release] Prepare for 1.11.0 release.

2019-09-19 Thread karsten

commit a51b6e49cde838422f44d54881d972f17f28372a
Author: Karsten Loesing 
Date:   Thu Sep 19 11:10:49 2019 +0200

Prepare for 1.11.0 release.
---
 CHANGELOG.md | 7 ++-
 build.xml| 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ecfb35..f5f9488 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# Changes in version 1.11.0 - 2019-09-19
+
+ * Medium changes
+   - Archive bridge pool assignments again.
+
+
 # Changes in version 1.10.0 - 2019-09-12
 
  * Medium changes
@@ -15,7 +21,6 @@
- Remove Cobertura from the build process.
- Archive snowflake statistics.
- Update to metrics-lib 2.7.0.
-   - Archive bridge pool assignments again.
 
 
 # Changes in version 1.9.1 - 2019-05-29
diff --git a/build.xml b/build.xml
index 4bada49..faf44a9 100644
--- a/build.xml
+++ b/build.xml
@@ -9,7 +9,7 @@
 
   
   
-  
+  
   
   
   

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

[tor-commits] [collector/release] Bump version to 1.10.0-dev.

2019-09-19 Thread karsten

commit 16894a4d0096ac76e0ccbba1cd7b593ab1ddab2c
Author: Karsten Loesing 
Date:   Thu Sep 12 10:59:05 2019 +0200

Bump version to 1.10.0-dev.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index f4812c4..4bada49 100644
--- a/build.xml
+++ b/build.xml
@@ -9,7 +9,7 @@
 
   
   
-  
+  
   
   
   



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

[tor-commits] [collector/release] Archive bridge pool assignments again.

2019-09-19 Thread karsten

commit b2b3363232fd1a425a6e83bde89b2687b56abc0a
Author: Karsten Loesing 
Date:   Fri Aug 30 11:09:23 2019 +0200

Archive bridge pool assignments again.

Implements #31558.
---
 CHANGELOG.md   |   1 +
 .../org/torproject/metrics/collector/Main.java |   3 +
 .../BridgePoolAssignmentsProcessor.java| 363 +
 .../metrics/collector/conf/Annotation.java |   1 +
 .../metrics/collector/conf/Configuration.java  |   1 +
 .../org/torproject/metrics/collector/conf/Key.java |   6 +
 .../persist/BridgePoolAssignmentPersistence.java   |  34 ++
 .../collector/persist/DescriptorPersistence.java   |   2 +
 .../metrics/collector/sync/SyncPersistence.java|   6 +
 src/main/resources/collector.properties|  18 +
 .../metrics/collector/conf/ConfigurationTest.java  |   2 +-
 .../metrics/collector/cron/CollecTorMainTest.java  |   1 +
 12 files changed, 437 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b38b124..4ecfb35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
- Remove Cobertura from the build process.
- Archive snowflake statistics.
- Update to metrics-lib 2.7.0.
+   - Archive bridge pool assignments again.
 
 
 # Changes in version 1.9.1 - 2019-05-29
diff --git a/src/main/java/org/torproject/metrics/collector/Main.java 
b/src/main/java/org/torproject/metrics/collector/Main.java
index 6907e93..3150ffc 100644
--- a/src/main/java/org/torproject/metrics/collector/Main.java
+++ b/src/main/java/org/torproject/metrics/collector/Main.java
@@ -4,6 +4,7 @@
 package org.torproject.metrics.collector;
 
 import org.torproject.metrics.collector.bridgedescs.SanitizedBridgesWriter;
+import 
org.torproject.metrics.collector.bridgepools.BridgePoolAssignmentsProcessor;
 import org.torproject.metrics.collector.conf.Configuration;
 import org.torproject.metrics.collector.conf.ConfigurationException;
 import org.torproject.metrics.collector.conf.Key;
@@ -49,6 +50,8 @@ public class Main {
 
   static { // add a new main class here
 collecTorMains.put(Key.BridgedescsActivated, SanitizedBridgesWriter.class);
+collecTorMains.put(Key.BridgePoolAssignmentsActivated,
+BridgePoolAssignmentsProcessor.class);
 collecTorMains.put(Key.ExitlistsActivated, ExitListDownloader.class);
 collecTorMains.put(Key.UpdateindexActivated, CreateIndexJson.class);
 collecTorMains.put(Key.RelaydescsActivated, ArchiveWriter.class);
diff --git 
a/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java
 
b/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java
new file mode 100644
index 000..cad91ef
--- /dev/null
+++ 
b/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java
@@ -0,0 +1,363 @@
+/* Copyright 2011--2019 The Tor Project
+ * See LICENSE for licensing information */
+
+package org.torproject.metrics.collector.bridgepools;
+
+import org.torproject.metrics.collector.conf.Configuration;
+import org.torproject.metrics.collector.conf.ConfigurationException;
+import org.torproject.metrics.collector.conf.Key;
+import org.torproject.metrics.collector.cron.CollecTorMain;
+
+import org.apache.commons.codec.DecoderException;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.time.DateTimeException;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.Stack;
+import java.util.TreeMap;
+
+public class BridgePoolAssignmentsProcessor extends CollecTorMain {
+
+  /**
+   * Class logger.
+   */
+  private static final Logger logger = LoggerFactory.getLogger(
+  BridgePoolAssignmentsProcessor.class);
+
+  /**
+   * Directory containing original, not-yet-sanitized bridge pool assignment
+   * files.
+   */
+  private File assignmentsDirectory;
+
+  /**
+   * Directory containing sanitized bridge pool assignments for tarballs.
+   */
+  private String outputPathName;
+
+  /**
+   * Directory containing recently stored sanitized bridge pool assignments.
+   */
+  private String recentPathName;
+
+  /**
+   * Timestamp format in bridge-pool-assignments line.
+   */
+  private DateTimeFormatter assignmentFormat = DateTimeFormatter.ofPattern(
+

[tor-commits] [collector/release] Tone down a warning about outdated assignments.

2019-09-19 Thread karsten

commit 54ac654d40544bab48cec58ba64546ef6ffe0bfe
Author: Karsten Loesing 
Date:   Thu Sep 19 11:08:41 2019 +0200

Tone down a warning about outdated assignments.
---
 .../BridgePoolAssignmentsProcessor.java| 23 ++
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git 
a/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java
 
b/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java
index cad91ef..a386fb6 100644
--- 
a/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java
+++ 
b/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java
@@ -115,11 +115,19 @@ public class BridgePoolAssignmentsProcessor extends 
CollecTorMain {
 logger.info("Starting bridge-pool-assignments module of CollecTor.");
 this.initializeConfiguration();
 List assignmentFiles = this.listAssignmentFiles();
+LocalDateTime latestPublished = null;
 for (File assignmentFile : assignmentFiles) {
   logger.info("Processing bridge pool assignment file '{}'...",
   assignmentFile.getAbsolutePath());
+  SortedMap>
+  readBridgePoolAssignments
+  = this.readBridgePoolAssignments(assignmentFile);
+  if (null == latestPublished
+  || readBridgePoolAssignments.lastKey().isAfter(latestPublished)) {
+latestPublished = readBridgePoolAssignments.lastKey();
+  }
   for (Map.Entry> e
-   : this.readBridgePoolAssignments(assignmentFile).entrySet()) {
+   : readBridgePoolAssignments.entrySet()) {
 LocalDateTime published = e.getKey();
 SortedMap originalAssignments = e.getValue();
 SortedMap sanitizedAssignments
@@ -144,6 +152,12 @@ public class BridgePoolAssignmentsProcessor extends 
CollecTorMain {
 }
   }
 }
+if (null != latestPublished
+&& latestPublished.minusMinutes(330L).isBefore(LocalDateTime.now())) {
+  logger.warn("The last known bridge pool assignment list was "
+  + "published at {}, which is more than 5:30 hours in the past.",
+  latestPublished);
+}
 this.cleanUpRsyncDirectory();
 logger.info("Finished processing bridge pool assignment file(s).");
   }
@@ -251,13 +265,6 @@ public class BridgePoolAssignmentsProcessor extends 
CollecTorMain {
   logger.warn("Could not read bridge pool assignment file '{}'. "
   + "Skipping.", assignmentFile.getAbsolutePath(), e);
 }
-if (!readBridgePoolAssignments.isEmpty()
-&& readBridgePoolAssignments.lastKey().minusMinutes(330L)
-.isBefore(LocalDateTime.now())) {
-  logger.warn("The last known bridge pool assignment list was "
-  + "published at {}, which is more than 5:30 hours in the past.",
-  readBridgePoolAssignments.lastKey());
-}
 return readBridgePoolAssignments;
   }
 



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

[tor-commits] [collector/release] Upgrade to latest metrics-base.

2019-09-19 Thread karsten

commit 522a54ed4751faf9b595100ac63dd5fd0b446f25
Author: Karsten Loesing 
Date:   Thu Sep 19 10:29:27 2019 +0200

Upgrade to latest metrics-base.
---
 src/build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/build b/src/build
index 75cda35..0674958 16
--- a/src/build
+++ b/src/build
@@ -1 +1 @@
-Subproject commit 75cda35ba7375ab0f5b12fa214620c3a29917097
+Subproject commit 0674958512c705255d4ec4631d3280068ce0a7af



___
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

2019-09-19 Thread translation

commit 88753bcbcabeec68911e15b1f6a01f7a371fe8a9
Author: Translation commit bot 
Date:   Thu Sep 19 09:19:56 2019 +

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

diff --git a/contents+fa.po b/contents+fa.po
index 88a2033f6..b06f2faed 100644
--- a/contents+fa.po
+++ b/contents+fa.po
@@ -2254,6 +2254,8 @@ msgid ""
 "* BitTorrent in specific is [not anonymous over "
 "Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
+"* Ø¨ÛØª ØªÙØ±ÙØªØ Ø¨Ù Ø·ÙØ± Ø®Ø§Øµ [Ø¨Ø± Ø±ÙÛ ØªÙØ±Ø ÙØ§Ø´ÙØ§Ø³ 
ÙÙÛ "
+"Ø¨Ø§Ø´Ø¯](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2273,7 +2275,7 @@ msgstr "ØØ°Ù ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ø§Ø² Ø³ÛØ³ØªÙ Ø´ÙØ§ 
Ø³Ø§Ø¯Ù Ø§Ø³Øª:"
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid "On Windows:"
-msgstr ""
+msgstr "Ø¯Ø± ÙÛÙØ¯ÙØ²:"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
@@ -2281,21 +2283,23 @@ msgid ""
 "* Locate your Tor Browser folder or application. The default location is the"
 " Desktop."
 msgstr ""
+"* ÙØÙ Ù¾ÙØ´Ù ÙØ±ÙØ±Ú¯Ø± ØªÙØ± ÛØ§ ÙØ±Ù Ø§ÙØ²Ø§Ø± Ø±Ø§ ÙØ´Ø®Øµ 
Ú©ÙÛØ¯. ÙÚ©Ø§Ù Ù¾ÛØ´ ÙØ±Ø¶ Ø¨Ø± Ø±ÙÛ Ø¯Ø³Ú©ØªØ§Ù¾ "
+"ÙÛ Ø¨Ø§Ø´Ø¯."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid "* Delete the Tor Browser folder or application."
-msgstr ""
+msgstr "* ÙØÙ Ù¾ÙØ´Ù ÙØ±ÙØ±Ú¯Ø± ØªÙØ± ÛØ§ ÙØ±Ù Ø§ÙØ²Ø§Ø± Ø±Ø§ 
ØØ°Ù Ú©ÙÛØ¯."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid "* Empty your Trash."
-msgstr ""
+msgstr "* Ø²Ø¨Ø§ÙÙ ÙØ§Û Ø®ÙØ¯ Ø±Ø§ Ø®Ø§ÙÛ Ú©ÙÛØ¯."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid "On macOS:"
-msgstr ""
+msgstr "Ø¯Ø± Ø³ÛØ³ØªÙ Ø¹Ø§ÙÙ macOS:"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
@@ -2303,16 +2307,18 @@ msgid ""
 "* Locate your Tor Browser application. The default location is the "
 "Applications folder."
 msgstr ""
+"* ÙØÙ Ù¾ÙØ´Ù ÙØ±ÙØ±Ú¯Ø± ØªÙØ± ÛØ§ ÙØ±Ù Ø§ÙØ²Ø§Ø± Ø±Ø§ ÙØ´Ø®Øµ 
Ú©ÙÛØ¯. ÙÚ©Ø§Ù Ù¾ÛØ´ ÙØ±Ø¶ Ø¯Ø± Ù¾ÙØ´Ù "
+"Applications ÙÛ Ø¨Ø§Ø´Ø¯."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid "* Move the Tor Browser application to Trash."
-msgstr ""
+msgstr "* Ø¨Ø±ÙØ§ÙÙ ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ø±Ø§ ØØ°Ù Ú©ÙÛØ¯."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid "* Go to your `~/Library/Application Support/` folder."
-msgstr ""
+msgstr "Ø¨Ù Ù¾ÙØ´Ù `~/Library/Application Support/` Ø¨Ø±ÙÛØ¯."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
@@ -2320,6 +2326,9 @@ msgid ""
 "* Note the Library folder is hidden on newer versions of macOS. To navigate "
 "to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
+"* ØªÙØ¬Ù Ø¯Ø§Ø´ØªÙ Ø¨Ø§Ø´ÛØ¯ Ú©Ù Ø¯Ø± ÙØ³Ø®Ù ÙØ§Û Ø¬Ø¯ÛØ¯ Ø³ÛØ³ØªÙ
 Ø¹Ø§ÙÙ macOSØ Ù¾ÙØ´Ù Library Ø¨Ù "
+"ØµÙØ±Øª Ù¾ÙÙØ§Ù ÙÛ Ø¨Ø§Ø´Ø¯. Ø¨Ø±Ø§Û Ø¯Ø³ØªØ±Ø³Û Ø¨Ù Ø§ÛÙ Ù¾ÙØ´Ù 
Ø§Ø² Ø·Ø±ÛÙ Finder Ù Ø§Ø² ÙÙÙÛ \"Go\"Ø"
+" Ú¯Ø²ÛÙÙ \"Go to Folder...\" Ø±Ø§ Ø§ÙØªØ®Ø§Ø¨ Ú©ÙÛØ¯."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
@@ -2327,12 +2336,16 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid ""
 "*  Then type \"~/Library/Application Support/\" in the window and click Go."
 msgstr ""
+"* Ø³Ù¾Ø³ Ø¯Ø± Ù¾ÙØ¬Ø±Ù Ø¨Ø§Ø² Ø´Ø¯Ù Ø¹Ø¨Ø§Ø±Øª \"~/Library/Application 
Support/\" Ø±Ø§ ØªØ§ÛÙ¾ Ú©Ø±Ø¯Ù"
+" Ù Ø¨Ø± Ø±ÙÛ Go Ú©ÙÛÚ© Ú©ÙÛØ¯."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
@@ -2340,6 +2353,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/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] [collector/master] Tone down a warning about outdated assignments.

2019-09-19 Thread karsten

commit 54ac654d40544bab48cec58ba64546ef6ffe0bfe
Author: Karsten Loesing 
Date:   Thu Sep 19 11:08:41 2019 +0200

Tone down a warning about outdated assignments.
---
 .../BridgePoolAssignmentsProcessor.java| 23 ++
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git 
a/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java
 
b/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java
index cad91ef..a386fb6 100644
--- 
a/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java
+++ 
b/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java
@@ -115,11 +115,19 @@ public class BridgePoolAssignmentsProcessor extends 
CollecTorMain {
 logger.info("Starting bridge-pool-assignments module of CollecTor.");
 this.initializeConfiguration();
 List assignmentFiles = this.listAssignmentFiles();
+LocalDateTime latestPublished = null;
 for (File assignmentFile : assignmentFiles) {
   logger.info("Processing bridge pool assignment file '{}'...",
   assignmentFile.getAbsolutePath());
+  SortedMap>
+  readBridgePoolAssignments
+  = this.readBridgePoolAssignments(assignmentFile);
+  if (null == latestPublished
+  || readBridgePoolAssignments.lastKey().isAfter(latestPublished)) {
+latestPublished = readBridgePoolAssignments.lastKey();
+  }
   for (Map.Entry> e
-   : this.readBridgePoolAssignments(assignmentFile).entrySet()) {
+   : readBridgePoolAssignments.entrySet()) {
 LocalDateTime published = e.getKey();
 SortedMap originalAssignments = e.getValue();
 SortedMap sanitizedAssignments
@@ -144,6 +152,12 @@ public class BridgePoolAssignmentsProcessor extends 
CollecTorMain {
 }
   }
 }
+if (null != latestPublished
+&& latestPublished.minusMinutes(330L).isBefore(LocalDateTime.now())) {
+  logger.warn("The last known bridge pool assignment list was "
+  + "published at {}, which is more than 5:30 hours in the past.",
+  latestPublished);
+}
 this.cleanUpRsyncDirectory();
 logger.info("Finished processing bridge pool assignment file(s).");
   }
@@ -251,13 +265,6 @@ public class BridgePoolAssignmentsProcessor extends 
CollecTorMain {
   logger.warn("Could not read bridge pool assignment file '{}'. "
   + "Skipping.", assignmentFile.getAbsolutePath(), e);
 }
-if (!readBridgePoolAssignments.isEmpty()
-&& readBridgePoolAssignments.lastKey().minusMinutes(330L)
-.isBefore(LocalDateTime.now())) {
-  logger.warn("The last known bridge pool assignment list was "
-  + "published at {}, which is more than 5:30 hours in the past.",
-  readBridgePoolAssignments.lastKey());
-}
 return readBridgePoolAssignments;
   }
 



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

[tor-commits] [collector/master] Prepare for 1.11.0 release.

2019-09-19 Thread karsten

commit a51b6e49cde838422f44d54881d972f17f28372a
Author: Karsten Loesing 
Date:   Thu Sep 19 11:10:49 2019 +0200

Prepare for 1.11.0 release.
---
 CHANGELOG.md | 7 ++-
 build.xml| 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ecfb35..f5f9488 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# Changes in version 1.11.0 - 2019-09-19
+
+ * Medium changes
+   - Archive bridge pool assignments again.
+
+
 # Changes in version 1.10.0 - 2019-09-12
 
  * Medium changes
@@ -15,7 +21,6 @@
- Remove Cobertura from the build process.
- Archive snowflake statistics.
- Update to metrics-lib 2.7.0.
-   - Archive bridge pool assignments again.
 
 
 # Changes in version 1.9.1 - 2019-05-29
diff --git a/build.xml b/build.xml
index 4bada49..faf44a9 100644
--- a/build.xml
+++ b/build.xml
@@ -9,7 +9,7 @@
 
   
   
-  
+  
   
   
   

___
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

2019-09-19 Thread translation

commit 46894ddee8fc2d0fa1fc5b922b0272cd0a64958a
Author: Translation commit bot 
Date:   Thu Sep 19 08:49:54 2019 +

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

diff --git a/contents+fa.po b/contents+fa.po
index 35126d270..88a2033f6 100644
--- a/contents+fa.po
+++ b/contents+fa.po
@@ -952,6 +952,9 @@ msgid ""
 "need to enter bridge addresses manually. Read the [Bridges](/en-US/bridges/)"
 " section to learn what bridges are and how to obtain them."
 msgstr ""
+"Ø§Ú¯Ø± Ø´ÙØ§ Ø¨Ø§ ÙÛÚ Ú©Ø¯Ø§Ù Ø§Ø² Ø§ÛÙ ÙÙØ§Ø±Ø¯ ÙØªÙØ§ÙØ³ØªÛØ¯ 
Ø¨Ù Ø§ÛÙØªØ±ÙØª ÙØªØµÙ Ø´ÙÛØ¯Ø ÙÛØ§Ø² Ø§Ø³Øª ØªØ§"
+" Ø¨Ù ØµÙØ±Øª Ø¯Ø³ØªÛØ Ø¢Ø¯Ø±Ø³ ÛÚ© Ø§ÛØ³ØªÚ¯Ø§Ù Ù¾Ù Ø±Ø§ ÙØ§Ø±Ø¯ 
Ú©ÙÛØ¯. Ø¨Ø±Ø§Û Ø¢Ø´ÙØ§ÛÛ Ø¨Ø§ Ù¾Ù ÙØ§ Ù Ø§ÛÙÚ©Ù"
+" ÚÚ¯ÙÙÙ Ø¨Ø§ÛØ¯ Ø¢Ù ÙØ§ Ø±Ø§ Ø¨Ø¯Ø³Øª Ø¢ÙØ±ÛØ¯Ø Ø¨Ø®Ø´ [Ù¾Ù 
ÙØ§](/en-US/bridges/) Ø±Ø§ Ø¨Ø®ÙØ§ÙÛØ¯."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
@@ -1057,6 +1060,8 @@ msgid ""
 "[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support "
 "Portal](https://support.torproject.org/tbb/tbb-2/)."
 msgstr ""
+"Ø¯Ø± Ø¯Ø§Ø®Ù ÛÚ© ÚØ±Ø®Ù ØªÙØ±Ø Ú¯Ø±Ù ÙÚ¯ÙØ¨Ø§Ù ÛØ§ Ú¯Ø±Ù 
ÙØ±ÙØ¯ÛØ ÙÙÛØ´Ù Ø¨Ù Ø¹ÙÙØ§Ù ÙØ®Ø³ØªÛÙ Ú¯Ø±Ù Ø¯Ø± ÚØ±Ø®Ù ÙÛ 
Ø¨Ø§Ø´Ø¯ Ù Ø¨Ù ØµÙØ±Øª ØªØµØ§Ø¯ÙÛ Ù Ø®ÙØ¯Ú©Ø§Ø± ØªÙØ³Ø· ØªÙØ± 
Ø§ÙØªØ®Ø§Ø¨ ÙÛ Ø´ÙØ¯ Ù ÙØ³Ø¨Øª Ø¨Ù Ø³Ø§ÛØ± Ú¯Ø±Ù ÙØ§Û Ø¯Ø§Ø®Ù 
ÚØ±Ø®ÙØ ÙØªÙØ§ÙØª Ø§Ø³Øª. Ø¨Ù ÙÙØ¸ÙØ± Ù¾ÛØ´Ú¯ÛØ±Û Ø§Ø² ØÙÙØ§Øª 
Ù¾Ø±ÙÙØ§ÛÙ Ú©Ù ÙÙØ¹Û ØÙÙÙ ÙØ®Ø±Ø¨ Ø§Ø² Ø³ÙÛ ÙÙØ§Ø¬Ù ÙÛ 
Ø¨Ø§Ø´ÙØ¯Ø Ø¨Ø± Ø®ÙØ§Ù Ø³Ø§ÛØ± Ú¯Ø±Ù ÙØ§ Ú©Ù ÙØ± Ø¨Ø§Ø± Ú©Ù Ø¨Ù 
Ø¯Ø§ÙÙÙ Ø§ÛÙØªØ±ÙØªÛ Ø¬Ø¯ÛØ¯Û ÙØµÙ ÙÛ Ø´ÙÛØ¯Ø Ø¢Ø¯Ø±Ø³ Ø¢Ù 
ÙØ§ ØªØºÛÛØ± ÙÛ Ú©ÙØ¯Ø Ú¯Ø±Ù ÙÚ¯ÙØ¨Ø§Ù ÙÙØ· Ù¾Ø³ Ø§Ø² 2-3 ÙØ§Ù 
ØªØºÛÛØ± Ø®ÙØ§ÙØ¯ Ú©Ø±Ø¯.\n"
+"Ø¨Ø±Ø§Û Ø¢Ú¯Ø§ÙÛ Ø¨ÛØ´ØªØ±Ø¯Ø±Ø¨Ø§Ø±Ù Ú¯Ø±ÙâÙØ§Û ÙÚ¯ÙØ¨Ø§ÙØ 
Ø¨Ù [Ù¾Ø±Ø³Ø´ ÙØ§Û Ù¾Ø±ØªÚ©Ø±Ø§Ø± 
Ú©Ø§Ø±Ø¨Ø±Ø§Ù](https://www.torproject.org/docs/faq#EntryGuards) Ù [Ù¾Ø±ØªØ§Ù 
Ù¾Ø´ØªÛØ¨Ø§ÙÛ](https://support.torproject.org/tbb/tbb-2/) Ø³Ø± Ø¨Ø²ÙÛØ¯. "
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1102,6 +1107,9 @@ msgid ""
 "* See the [Secure Connections](/secure-connections) page for important "
 "information on how to secure your connection when logging in."
 msgstr ""
+"* Ø¨Ø±Ø§Û Ø¯Ø±ÛØ§ÙØª Ø§Ø·ÙØ§Ø¹Ø§Øª ÙÙÙ Ø¯Ø± Ø®ØµÙØµ Ø§ÛÙÙ Ø³Ø§Ø²Û 
Ø§Ø±ØªØ¨Ø§Ø· Ø¯Ø± ÙÙÚ¯Ø§Ù ÙØ±ÙØ¯ Ø¨Ù ÙØ¨ Ø³Ø§ÛØª "
+"ÙØ§ - ÙØ§Ú¯ÛÙ Ú©Ø±Ø¯Ù -  Ø¨Ù ØµÙØÙâÛ [Ø§Ø±ØªØ¨Ø§Ø·Ø§Øª Ø§Ù
Ù](/secure-connections) ÙØ±Ø§Ø¬Ø¹Ù "
+"Ú©ÙÛØ¯."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1179,6 +1187,14 @@ msgid ""
 " does not clear any private information or unlink your activity, nor does it"
 " affect your current connections to other websites."
 msgstr ""
+"Ø§ÛÙ Ú¯Ø²ÛÙÙ Ø¨Ø±Ø§Û Ø²ÙØ§ÙÛ ÙÙÛØ¯ Ø®ÙØ§ÙØ¯ Ø¨ÙØ¯ Ú©Ù [Ú¯Ø±Ù 
Ù¾Ø§ÛØ§ÙÛ ØªÙØ±](/about/#how-tor-"
+"works) ÙØªÙØ§ÙØ¯ Ø´ÙØ§ Ø±Ø§ Ø¨Ù ÙØ¨ Ø³Ø§ÛØª ÙÙØ±Ø¯ÙØ¸Ø±ØªØ§Ù 
ÙØµÙ Ú©ÙØ¯ Ù ÛØ§ ÙØ¨ Ø³Ø§ÛØªØ Ø¨Ù Ø¯Ø±Ø³ØªÛ "
+"Ø¨Ø§Ø±Ú¯ÛØ±Û Ù ÙÙØ§ÛØ´ Ø¯Ø§Ø¯Ù ÙØ´ÙØ¯. Ø¨Ø§ Ø§ÙØªØ®Ø§Ø¨ Ø§ÛÙ 
Ú¯Ø²ÛÙÙØ Ø³Ø±Ø¨Ø±Ú¯ ÛØ§ Ù¾ÙØ¬Ø±Ù ÙØ¹ÙÛ ÙØ±ÙØ±Ú¯Ø± "
+"ØªÙØ± Ø¨Ø± Ø±ÙÛ ÚØ±Ø®Ù Ø¬Ø¯ÛØ¯Ø Ø§Ø² ÙÙ Ø¨Ø§Ø±Ú¯ÛØ±Û Ø®ÙØ§ÙØ¯ 
Ø´Ø¯. Ø³Ø§ÛØ± Ø³Ø±Ø¨Ø±Ú¯ ÙØ§ ÛØ§ Ù¾ÙØ¬Ø±Ù ÙØ§Û "
+"ÙØ±Ø¨ÙØ· \"Ø¨Ù ÙÙØ§Ù ÙØ¨ Ø³Ø§ÛØª\" ÙÛØ² Ø¯ÙØ¨Ø§Ø±Ù Ø¨Ø§Ø±Ú¯ÛØ±Û 
Ø´Ø¯Ù Ù Ø¨Ø± Ø±ÙÛ ÚØ±Ø®Ù Ø¬Ø¯ÛØ¯ ÙØ±Ø§Ø± ÙÛ "
+"Ú¯ÛØ±ÙØ¯. Ø§ÛÙ Ú¯Ø²ÛÙÙØ ÙÛÚ Ú©Ø¯Ø§Ù Ø§Ø² Ø§Ø·ÙØ§Ø¹Ø§Øª 
Ø®ØµÙØµÛ Ø´ÙØ§ Ø±Ø§ Ù¾Ø§Ú© ÙÙÛ Ú©ÙØ¯Ø Ù¾ÛÙÙØ¯ Ø¨ÛÙ "
+"ÙØ¹Ø§ÙÛØª ÙØ§Û ÙØ¨Ú¯Ø±Ø¯Û Ø±Ø§ Ø§Ø² Ø¨ÛÙ ÙÙÛ Ø¨Ø±Ø¯ Ù Ø¨Ø± 
Ø±ÙÛ Ø§Ø±ØªØ¨Ø§Ø· Ø´ÙØ§ Ø¨Ù Ø¯ÛÚ¯Ø± ÙØ¨ Ø³Ø§ÛØª ÙØ§Ø "
+"ÙÛÚ ØªØ§Ø«ÛØ±Û ÙØ®ÙØ§ÙØ¯ Ø¯Ø§Ø´Øª."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1235,6 +1251,9 @@ msgid ""
 "so you do not need to worry about [connecting over HTTPS](/secure-"
 "connections)."
 msgstr ""
+"* ØªÙØ§Ù ØªØ±Ø§ÙÛÚ© Ø¨ÛÙ Ú©Ø§Ø±Ø¨Ø±Ø§Ù ØªÙØ± Ù Ø³Ø±ÙÛØ³ ÙØ§Û 
Ù¾ÛØ§Ø²Û Ø¨Ø± Ø§Ø³Ø§Ø³ Ø±ÙØ²Ú¯Ø°Ø§Ø±Û Ø§ÙØªÙØ§ Ø¨Ù "
+"Ø§ÙØªÙØ§ Ø§ÙØ¬Ø§Ù ÙÛ Ø´ÙØ¯ Ù Ø¨ÙØ§Ø¨Ø±Ø§ÛÙØ ÙÛØ§Ø²Û Ø¨Ù 
ÙÚ¯Ø±Ø§ÙÛ Ø¯Ø± ÙÙØ±Ø¯ [Ø§Ø±ØªØ¨Ø§Ø· Ø¨Ø± Ø±ÙÛ HTTPS"
+"](/secure-connections) ÙÙÛ Ø¨Ø§Ø´Ø¯."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1307,6 +1326,9 @@ msgid ""
 "You can also ensure that you're able to access other onion services by "
 "connecting to [DuckDuckGo's Onion

[tor-commits] [collector/master] Archive bridge pool assignments again.

2019-09-19 Thread karsten

commit b2b3363232fd1a425a6e83bde89b2687b56abc0a
Author: Karsten Loesing 
Date:   Fri Aug 30 11:09:23 2019 +0200

Archive bridge pool assignments again.

Implements #31558.
---
 CHANGELOG.md   |   1 +
 .../org/torproject/metrics/collector/Main.java |   3 +
 .../BridgePoolAssignmentsProcessor.java| 363 +
 .../metrics/collector/conf/Annotation.java |   1 +
 .../metrics/collector/conf/Configuration.java  |   1 +
 .../org/torproject/metrics/collector/conf/Key.java |   6 +
 .../persist/BridgePoolAssignmentPersistence.java   |  34 ++
 .../collector/persist/DescriptorPersistence.java   |   2 +
 .../metrics/collector/sync/SyncPersistence.java|   6 +
 src/main/resources/collector.properties|  18 +
 .../metrics/collector/conf/ConfigurationTest.java  |   2 +-
 .../metrics/collector/cron/CollecTorMainTest.java  |   1 +
 12 files changed, 437 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b38b124..4ecfb35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
- Remove Cobertura from the build process.
- Archive snowflake statistics.
- Update to metrics-lib 2.7.0.
+   - Archive bridge pool assignments again.
 
 
 # Changes in version 1.9.1 - 2019-05-29
diff --git a/src/main/java/org/torproject/metrics/collector/Main.java 
b/src/main/java/org/torproject/metrics/collector/Main.java
index 6907e93..3150ffc 100644
--- a/src/main/java/org/torproject/metrics/collector/Main.java
+++ b/src/main/java/org/torproject/metrics/collector/Main.java
@@ -4,6 +4,7 @@
 package org.torproject.metrics.collector;
 
 import org.torproject.metrics.collector.bridgedescs.SanitizedBridgesWriter;
+import 
org.torproject.metrics.collector.bridgepools.BridgePoolAssignmentsProcessor;
 import org.torproject.metrics.collector.conf.Configuration;
 import org.torproject.metrics.collector.conf.ConfigurationException;
 import org.torproject.metrics.collector.conf.Key;
@@ -49,6 +50,8 @@ public class Main {
 
   static { // add a new main class here
 collecTorMains.put(Key.BridgedescsActivated, SanitizedBridgesWriter.class);
+collecTorMains.put(Key.BridgePoolAssignmentsActivated,
+BridgePoolAssignmentsProcessor.class);
 collecTorMains.put(Key.ExitlistsActivated, ExitListDownloader.class);
 collecTorMains.put(Key.UpdateindexActivated, CreateIndexJson.class);
 collecTorMains.put(Key.RelaydescsActivated, ArchiveWriter.class);
diff --git 
a/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java
 
b/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java
new file mode 100644
index 000..cad91ef
--- /dev/null
+++ 
b/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java
@@ -0,0 +1,363 @@
+/* Copyright 2011--2019 The Tor Project
+ * See LICENSE for licensing information */
+
+package org.torproject.metrics.collector.bridgepools;
+
+import org.torproject.metrics.collector.conf.Configuration;
+import org.torproject.metrics.collector.conf.ConfigurationException;
+import org.torproject.metrics.collector.conf.Key;
+import org.torproject.metrics.collector.cron.CollecTorMain;
+
+import org.apache.commons.codec.DecoderException;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.time.DateTimeException;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.Stack;
+import java.util.TreeMap;
+
+public class BridgePoolAssignmentsProcessor extends CollecTorMain {
+
+  /**
+   * Class logger.
+   */
+  private static final Logger logger = LoggerFactory.getLogger(
+  BridgePoolAssignmentsProcessor.class);
+
+  /**
+   * Directory containing original, not-yet-sanitized bridge pool assignment
+   * files.
+   */
+  private File assignmentsDirectory;
+
+  /**
+   * Directory containing sanitized bridge pool assignments for tarballs.
+   */
+  private String outputPathName;
+
+  /**
+   * Directory containing recently stored sanitized bridge pool assignments.
+   */
+  private String recentPathName;
+
+  /**
+   * Timestamp format in bridge-pool-assignments line.
+   */
+  private DateTimeFormatter assignmentFormat = DateTimeFormatter.ofPattern(
+

[tor-commits] [collector/master] Upgrade to latest metrics-base.

2019-09-19 Thread karsten

commit 522a54ed4751faf9b595100ac63dd5fd0b446f25
Author: Karsten Loesing 
Date:   Thu Sep 19 10:29:27 2019 +0200

Upgrade to latest metrics-base.
---
 src/build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/build b/src/build
index 75cda35..0674958 16
--- a/src/build
+++ b/src/build
@@ -1 +1 @@
-Subproject commit 75cda35ba7375ab0f5b12fa214620c3a29917097
+Subproject commit 0674958512c705255d4ec4631d3280068ce0a7af



___
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

2019-09-19 Thread translation

commit a33b35a917925ef3b7fd1b235db4bc102d3c5e50
Author: Translation commit bot 
Date:   Thu Sep 19 08:19:50 2019 +

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

diff --git a/contents+fa.po b/contents+fa.po
index f7906d92a..35126d270 100644
--- a/contents+fa.po
+++ b/contents+fa.po
@@ -201,6 +201,9 @@ msgid ""
 " valid for a single session (until Tor Browser is exited or a [New Identity"
 "](/managing-identities/#new-identity) is requested)."
 msgstr ""
+"Ø¨Ù ØµÙØ±Øª Ù¾ÛØ´ ÙØ±Ø¶Ø ÙØ±ÙØ±Ú¯Ø± ØªÙØ± ØªØ§Ø±ÛØ®ÚÙ ÙØ¨Ú¯Ø±Ø¯Û 
Ø´ÙØ§ Ø±Ø§ ÙÚ¯ÙØ¯Ø§Ø±Û ÙÙÛ Ú©ÙØ¯. Ú©ÙÚ©Û ÙØ§ "
+"ÙÙØ· Ø¨Ø±Ø§Û ÛÚ© ÙØ´Ø³Øª ÙØ¹ØªØ¨Ø± ÙØ³ØªÙØ¯ (ØªØ§ Ø²ÙØ§Ù Ø®Ø±ÙØ¬ 
Ø§Ø² ÙØ±ÙØ±Ú¯Ø± ØªÙØ± ÛØ§ Ø¯Ø±Ø®ÙØ§Ø³Øª ÛÚ© [ÙÙÛØª"
+" Ø¬Ø¯ÛØ¯](/managing-identities/#new-identity))."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -426,6 +429,12 @@ msgid ""
 "connection, but this bar seems to get stuck at a certain point, see the "
 "[Troubleshooting](/troubleshooting) page for help solving the problem."
 msgstr ""
+"Ø¯Ø± Ø¨ÛØ´ØªØ± ÙÙØ§Ø±Ø¯Ø Ø§ÙØªØ®Ø§Ø¨ Ø¯Ú©ÙÙ \"Ø§ØªØµØ§Ù\" Ø¨Ù Ø´ÙØ§ 
Ø§ÙÚ©Ø§Ù ÙÛ Ø¯ÙØ¯ Ø¨Ø¯ÙÙ ÙÛÚÚ¯ÙÙÙ "
+"ØªÙØ¸ÛÙØ§Øª Ø§Ø¶Ø§ÙÛØ Ø¨Ù Ø´Ø¨Ú©Ù ØªÙØ± ÙØµÙ Ø´ÙÛØ¯. Ù¾Ø³ Ø§Ø² 
Ú©ÙÛÚ©Ø ÙÙØ§Ø± ÙØ¶Ø¹ÛØª Ø¸Ø§ÙØ± ÙÛ Ø´ÙØ¯ Ù "
+"Ù¾ÛØ´Ø±ÙØª Ø§ØªØµØ§Ù Ø¨Ù Ø´Ø¨Ú©Ù ØªÙØ± Ø±Ø§ ÙØ´Ø§Ù ÙÛ Ø¯ÙØ¯. 
Ø§Ú¯Ø± Ø§Ø² ÛÚ© Ø§ÛÙØªØ±ÙØª ÙØ³Ø¨ØªØ§Ù Ø³Ø±ÛØ¹ "
+"Ø§Ø³ØªÙØ§Ø¯Ù ÙÛ Ú©ÙÛØ¯Ø Ø§ÙØ§ ÙÙØ§Ø± ÙØ¶Ø¹ÛØª Ø§ØªØµØ§Ù Ø¨Ù 
Ø´Ø¨Ú©Ù ØªÙØ± Ø¯Ø± ÛÚ© ÙÙØ·Ù ÙØ´Ø®Øµ Ú¯ÛØ± Ú©Ø±Ø¯Ù "
+"Ø§Ø³ØªØ Ø¨Ø±Ø§Û Ú©ÙÚ© Ø¨Ù ØÙ Ø§ÛÙ ÙØ´Ú©Ù Ø¨Ù ØµÙØÙ [Ø¹ÛØ¨ 
ÛØ§Ø¨Û](/troubleshooting) ÙØ±Ø§Ø¬Ø¹Ù "
+"Ú©ÙÛØ¯."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -459,6 +468,12 @@ msgid ""
 " You will then be taken to the [Circumvention](/circumvention) screen to "
 "configure a pluggable transport."
 msgstr ""
+"Ø¯Ø± ØµÙØÙ ÙØ®Ø³Øª Ø§Ø² Ø´ÙØ§ ÙÛ Ù¾Ø±Ø³Ø¯ Ú©Ù Ø¢ÛØ§ Ø¯Ø³ØªØ±Ø³Û 
Ø¨Ù Ø´Ø¨Ú©Ù ØªÙØ± Ø¨Ø± Ø±ÙÛ Ø§Ø±ØªØ¨Ø§Ø· Ø§ÛÙØªØ±ÙØªÛ"
+" Ø´ÙØ§ ÙØ³Ø¯ÙØ¯ ÛØ§ Ø³Ø§ÙØ³ÙØ± Ø´Ø¯Ù Ø§Ø³ØªØ Ø§Ú¯Ø± ÙÚ©Ø± ÙÛ 
Ú©ÙÛØ¯ Ø§ÛÙ Ú¯ÙÙÙ ÙÛØ³ØªØ Ú¯Ø²ÛÙÙ \"Ø®ÛØ±\" "
+"Ø±Ø§ Ø§ÙØªØ®Ø§Ø¨ Ú©ÙÛØ¯. Ø§Ú¯Ø± ÙÛ Ø¯Ø§ÙÛØ¯ Ø§Ø±ØªØ¨Ø§Ø· 
Ø§ÛÙØªØ±ÙØªÛ Ø´ÙØ§ Ø³Ø§ÙØ³ÙØ± Ø´Ø¯Ù Ø§Ø³ØªØ ÛØ§ ÙÛÚ Ú©Ø¯Ø§Ù"
+" Ø§Ø² Ø±ÙØ´ ÙØ§ Ø¨Ø±Ø§Û Ø§ØªØµØ§Ù Ø¨Ù Ø´Ø¨Ú©Ù ØªÙØ± Ú©Ø§Ø± ÙÚ©Ø±Ø¯Ù 
Ø§Ø³ØªØ Ú¯Ø²ÛÙÙ \"Ø¨ÙÙ\" Ø±Ø§ Ø§ÙØªØ®Ø§Ø¨ "
+"Ú©ÙÛØ¯. Ø¯Ø± Ø§ÛÙ ØØ§ÙØªØ Ø¨Ø±Ø§Û Ù¾ÛÚ©Ø±Ø¨ÙØ¯Û ÛÚ© Pluggable 
TransportØ Ø¨Ù ØµÙØÙ [Ø¯ÙØ± Ø²Ø¯Ù "
+"Ø³Ø§ÙØ³ÙØ±](/circumvention) ÙÙØªÙÙ ÙÛ Ø´ÙÛØ¯."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -508,6 +523,12 @@ msgid ""
 "so an adversary cannot identify them easily. Using bridges in combination "
 "with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
+"Ø¨ÛØ´ØªØ±[Pluggable Transport](/transports)ÙØ§ ÙØ§ÙÙØ¯ obfs3 Ù obfs4Ø 
Ø¨Ø§ Ø§Ø³ØªÙØ§Ø¯Ù Ø§Ø²"
+" Ø§ÛØ³ØªÚ¯Ø§Ù ÙØ§Û Ù¾ÙÙ ÙØ§Ø¨Ù Ø§Ø¹ØªÙØ§Ø¯Ø Ú©Ø§Ø± ÙÛ Ú©ÙÙØ¯. Ù
Ø§ÙÙØ¯ Ø§ÛØ³ØªÚ¯Ø§Ù ÙØ§Û ÙØ¹ÙÙÙÛ ØªÙØ±Ø Ù¾Ù "
+"ÙØ§ ÙÛØ² ØªÙØ³Ø· Ø§ÙØ±Ø§Ø¯ Ø¯Ø§ÙØ·ÙØ¨ Ø§Ø¬Ø±Ø§ ÙÛ Ø´ÙÙØ¯Ø Ø§ÙØ§ 
Ø¨Ø±Ø®ÙØ§Ù Ø§ÛØ³ØªÚ¯Ø§Ù ÙØ§Û ÙØ¹ÙÙÙÛØ "
+"Ø§ÛØ³ØªÚ¯Ø§Ù ÙØ§Û Ù¾ÙØ Ø¨Ù ØµÙØ±Øª Ø¹ÙÙÙÛ ÙÙØªØ´Ø± ÙÙÛ 
Ø´ÙÙØ¯. Ø¨ÙØ§Ø¨Ø±Ø§ÛÙ Ø¯Ø´ÙÙØ§Ù Ø´Ø¨Ú©Ù ØªÙØ± ÙÙÛ "
+"ØªÙØ§ÙÙØ¯ Ø¢Ù ÙØ§ Ø±Ø§ Ø¨Ù Ø¢Ø³Ø§ÙÛ Ø´ÙØ§Ø³Ø§ÛÛ Ú©ÙÙØ¯. 
Ø§Ø³ØªÙØ§Ø¯Ù Ø§Ø² Ù¾Ù ÙØ§ Ø¨Ù ÙÙØ±Ø§Ù Pluggable "
+"Transport ÙØ§ ÙÙØ¬Ø¨ ÙÛ Ø´ÙØ¯ ØªØ§ Ú©Ø³Û ÙØªÙØ¬Ù Ø§Ø³ØªÙØ§Ø¯Ù Ø´Ù
Ø§ Ø§Ø² ØªÙØ± ÙØ´ÙØ¯."
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -843,6 +864,11 @@ msgid ""
 "transportsâ. See the [Pluggable Transports](/en-US/transports) page for 
more"
 " information on the types of transport that are currently available."
 msgstr ""
+"Ú¯Ø§ÙÛ Ø¯Ø³ØªØ±Ø³Û ÙØ³ØªÙÛÙ Ø¨Ù Ø´Ø¨Ú©Ù ØªÙØ±Ø ØªÙØ³Ø· Ø´Ø±Ú©Øª 
ÙØ±Ø§ÙÙ Ú©ÙÙØ¯Ù Ø§ÛÙØªØ±ÙØª - ISP - ÛØ§ "
+"Ø³Ø§ÛØ± ÙÙØ§Ø¯ÙØ§Û Ø¯ÙÙØªÛØ ÙØ³Ø¯ÙØ¯ ÙÛ Ø´ÙØ¯ Ù ÙÙÛ 
ØªÙØ§Ù Ø¨Ù Ø´Ø¨Ú©Ù ÙØµÙ Ø´Ø¯. ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ø¨Ø±Ø§Û "
+"Ø¨Ø±Ø·Ø±Ù Ú©Ø±Ø¯Ù Ø§ÛÙ ÙØ³Ø¯ÙØ¯ÛØª ÙØ§Ø Ø§Ø¨Ø²Ø§Ø±ÙØ§ÛÛ Ø±Ø§ 
Ø¨Ø±Ø§Û Ø¯ÙØ± Ø²Ø¯Ù Ø³Ø§ÙØ³ÙØ± Ø¯Ø± ÙØ¸Ø± Ú¯Ø±ÙØªÙ Ø§Ø³Øª"
+" Ú©Ù Ø¨Ø§ ÙØ§Ù Pluggable Transport Ø´ÙØ§Ø®ØªÙ ÙÛ Ø´ÙÙØ¯. Ø¨Ø±Ø§Û 
Ø¢Ú¯Ø§ÙÛ Ø¨ÛØ´ØªØ± Ø¯Ø± Ø§ÛÙ Ø¨Ø§Ø±ÙØ"
+" ØµÙØÙ[Pluggable Transport](/en-US/transports) Ø±Ø§ Ø¨Ø¨ÛÙÛØ¯."
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -906,6 +932,9 @@ msgid ""
 "way (for more

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

2019-09-19 Thread translation

commit b56d42ac3a4d6464b93587ade1aae1da64d9d1c5
Author: Translation commit bot 
Date:   Thu Sep 19 08:16:49 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
---
 code_of_conduct+fr.po | 132 +++---
 1 file changed, 115 insertions(+), 17 deletions(-)

diff --git a/code_of_conduct+fr.po b/code_of_conduct+fr.po
index be7ece2d2..24bad301e 100644
--- a/code_of_conduct+fr.po
+++ b/code_of_conduct+fr.po
@@ -163,6 +163,8 @@ msgid ""
 "  DON'T: Treat honest mistakes as an excuse to hassle people. Mistakes are 
for\n"
 "learning.\n"
 msgstr ""
+"NE PAS FAIRE: Traitez les erreurs honnÃªtes comme une excuse pour embÃªter 
des gens. Les erreurs sont pour\n"
+"apprendre.\n"
 
 #. type: Plain text
 #: ../code_of_conduct.txt:46
@@ -192,7 +194,9 @@ msgstr ""
 msgid ""
 "1. Purpose\n"
 "\n"
-msgstr "1. Propos\n"
+msgstr ""
+"1. Propos\n"
+"\n"
 
 #. type: Plain text
 #: ../code_of_conduct.txt:63
@@ -254,7 +258,9 @@ msgstr ""
 msgid ""
 "2. Be your best self\n"
 "\n"
-msgstr "2. FaÃ®tes le meilleur de vous-mÃªme.\n"
+msgstr ""
+"2. FaÃ®tes le meilleur de vous-mÃªme.\n"
+"\n"
 
 #. type: Plain text
 #: ../code_of_conduct.txt:80
@@ -387,11 +393,13 @@ msgid ""
 "Posting or threatening to post other peopleâs personally identifying "
 "information (\"doxing\") without their consent."
 msgstr ""
+"Afficher ou menacer de publier des informations dâidentitÃ© personnelle "
+"(\"doxing\") dâautres personnes sans leur consentement."
 
 #. type: Bullet: '  * '
 #: ../code_of_conduct.txt:127
 msgid "Personal insults or attacks, particularly those related to:"
-msgstr ""
+msgstr "Insultes ou attaques personnelles, en particulier celles liÃ©es Ã :"
 
 #. type: Bullet: '- '
 #: ../code_of_conduct.txt:129
@@ -401,7 +409,7 @@ msgstr "experience"
 #. type: Bullet: '- '
 #: ../code_of_conduct.txt:131
 msgid "gender identity or expression"
-msgstr ""
+msgstr "identitÃ© ou expression de genre"
 
 #. type: Bullet: '- '
 #: ../code_of_conduct.txt:133
@@ -416,12 +424,12 @@ msgstr "famille"
 #. type: Bullet: '- '
 #: ../code_of_conduct.txt:137
 msgid "relationships"
-msgstr ""
+msgstr "relations"
 
 #. type: Bullet: '- '
 #: ../code_of_conduct.txt:139
 msgid "ability (whether bodily or mental)"
-msgstr ""
+msgstr "capacitÃ© (physique ou mentale)"
 
 #. type: Bullet: '- '
 #: ../code_of_conduct.txt:141
@@ -431,12 +439,12 @@ msgstr "apparence personnel"
 #. type: Bullet: '- '
 #: ../code_of_conduct.txt:143
 msgid "socioeconomic status"
-msgstr ""
+msgstr "Statut socioÃ©conomique"
 
 #. type: Bullet: '- '
 #: ../code_of_conduct.txt:145
 msgid "body size"
-msgstr ""
+msgstr "taille du corps"
 
 #. type: Bullet: '- '
 #: ../code_of_conduct.txt:147
@@ -446,7 +454,7 @@ msgstr "race"
 #. type: Bullet: '- '
 #: ../code_of_conduct.txt:149
 msgid "ethnicity"
-msgstr ""
+msgstr "Ã©thnicitÃ©"
 
 #. type: Bullet: '- '
 #: ../code_of_conduct.txt:151
@@ -466,7 +474,7 @@ msgstr "nationalitÃ©"
 #. type: Bullet: '- '
 #: ../code_of_conduct.txt:157
 msgid "membership in a disadvantaged and/or underrepresented group"
-msgstr ""
+msgstr "appartenance Ã  un groupe dÃ©favorisÃ© et / ou sous-reprÃ©sentÃ©"
 
 #. type: Bullet: '  * '
 #: ../code_of_conduct.txt:161
@@ -475,6 +483,9 @@ msgid ""
 "information. You should have someone's consent before recording these "
 "things, and before posting them publicly."
 msgstr ""
+"Photographie, enregistrement audio ou enregistrement d'informations "
+"personnelles inappropriÃ©s. Vous devriez avoir le consentement de quelqu'un "
+"avant d'enregistrer ces choses et avant de les publier publiquement."
 
 #. type: Bullet: '  * '
 #: ../code_of_conduct.txt:164
@@ -482,6 +493,8 @@ msgid ""
 "Inappropriate physical contact. You should have someoneâs consent before "
 "touching them."
 msgstr ""
+"Contact physique inappropriÃ©. Vous devriez avoir le consentement de "
+"quelqu'un avant de le toucher."
 
 #. type: Bullet: '  * '
 #: ../code_of_conduct.txt:167
@@ -489,17 +502,22 @@ msgid ""
 "Unwelcome sexual attention: this includes sexualized comments or jokes, "
 "inappropriate touching, groping, and unwelcome sexual advances."
 msgstr ""
+"Attention sexuelle importune: cela inclut les commentaires ou les blagues "
+"sexualisÃ©s, les attouchements inappropriÃ©s, les tÃ¢tonnements et les 
avances "
+"sexuelles importunes."
 
 #. type: Bullet: '  * '
 #: ../code_of_conduct.txt:169
 msgid "Deliberate intimidation, stalking or following (online or in person)."
-msgstr ""
+msgstr "Intimidation dÃ©libÃ©rÃ©e, traque ou suivi (en ligne ou en personne)."
 
 #. type: Bullet: '  * '
 #: ../code_of_conduct.txt:172
 msgid ""
 "Deliberately undermining the

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

2019-09-19 Thread translation

commit 0973978d2e30d2e09d08327fececb578aa0a2cbd
Author: Translation commit bot 
Date:   Thu Sep 19 07:51:51 2019 +

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

diff --git a/fa/torcheck.po b/fa/torcheck.po
index 35934163c..76669b7e9 100644
--- a/fa/torcheck.po
+++ b/fa/torcheck.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2019-09-19 07:16+\n"
+"PO-Revision-Date: 2019-09-19 07:31+\n"
 "Last-Translator: MYZJ\n"
 "Language-Team: Persian 
(http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -30,7 +30,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 msgid "Congratulations. This browser is configured to use Tor."
-msgstr "ØªØ¨Ø±ÛÚ©. Ø§ÛÙ ÙØ±ÙØ±Ú¯Ø± Ø¢ÙØ§Ø¯Ù Ø§Ø³ØªÙØ§Ø¯Ù Ø§Ø² ØªÙØ± 
Ø§Ø³Øª."
+msgstr "ØªØ¨Ø±ÛÚ©. Ø§ÛÙ ÙØ±ÙØ±Ú¯Ø± Ø¨Ø±Ø§Û Ø§Ø³ØªÙØ§Ø¯Ù Ø§Ø² ØªÙØ± 
Ù¾ÛÚ©Ø±Ø¨ÙØ¯Û Ø´Ø¯Ù Ø§Ø³Øª."
 
 msgid ""
 "Please refer to the https://www.torproject.org/\;>Tor website "
@@ -44,7 +44,7 @@ msgstr "ÛÚ© Ø¨ÙâØ±ÙØ²Ø±Ø³Ø§ÙÛ Ø§ÙÙÛØªÛ Ø¨Ø±Ø§Û Ù
Ø±ÙØ±Ú¯Ø± ØªÙØ± 
 msgid ""
 "https://www.torproject.org/download/\;>Click here to go to the "
 "download page"
-msgstr "https://www.torproject.org/download/\;>Ø¨Ø±Ø§Û Ø±ÙØªÙ 
Ø¨Ù ØµÙØÙ Ø¯Ø§ÙÙÙØ¯Ø Ø§ÛÙ Ø¬Ø§ Ú©ÙÛÚ© Ú©ÙÛØ¯"
+msgstr "https://www.torproject.org/download/\;>Ø¨Ø±Ø§Û Ø±ÙØªÙ 
Ø¨Ù ØµÙØÙ Ø¯Ø§ÙÙÙØ¯ ÙØ±ÙØ±Ú¯Ø± ØªÙØ±Ø Ø§ÛÙ Ø¬Ø§ Ú©ÙÛÚ© 
Ú©ÙÛØ¯"
 
 msgid "Sorry. You are not using Tor."
 msgstr "ÙØªØ§Ø³ÙÛÙ. Ø´ÙØ§ Ø§Ø² ØªÙØ± Ø§Ø³ØªÙØ§Ø¯Ù ÙÙÛâÚ©ÙÛØ¯."
@@ -71,13 +71,13 @@ msgstr "Ø¨Ø±Ø§Û Ø¢Ú¯Ø§ÙÛ Ø¨ÛØ´ØªØ± Ø¯Ø± ÙÙØ±Ø¯ Ø§ÛÙ 
Ú¯Ø±Ù Ù¾Ø§ÛØ§ÙÛ
 msgid ""
 "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, "
 "development, and education of online anonymity and privacy."
-msgstr "Ù¾Ø±ÙÚÙ ØªÙØ±Ø ÛÚ© Ø³Ø§Ø²ÙØ§Ù ØºÛØ± Ø§ÙØªÙØ§Ø¹Û Ø¢Ù
Ø±ÛÚ©Ø§ÛÛ Ø¨Ø± Ø§Ø³Ø§Ø³ ÙÙØ§ÙÛÙ Ø³Ø±ÙÛØ³ Ø¯Ø±Ø¢ÙØ¯ Ø¯Ø§Ø®ÙÛ Ø¢Ù
Ø±ÛÚ©Ø§ Ø¨Ø§ Ú©Ø¯ 501(c)(3) ÙÛ Ø¨Ø§Ø´Ø¯.\nØ±ÙÛÚ©Ø±Ø¯ Ø§ÛÙ Ù¾Ø±ÙÚÙØ 
Ø¯Ø± Ø²ÙÛÙÙ Ù¾ÚÙÙØ´Ø ØªÙØ³Ø¹Ù Ù Ø¢ÙÙØ²Ø´ Ø¯Ø±Ø¨Ø§Ø±Ù ÙØ§Ø´ÙØ§Ø³ 
Ø¨ÙØ¯Ù Ù ØÙØ§Ø¸Øª Ø§Ø² ØØ±ÛÙ Ø´Ø®ØµÛ Ø¯Ø± ÙØ¶Ø§Û Ø¢ÙÙØ§ÛÙ ÙÛ 
Ø¨Ø§Ø´Ø¯."
+msgstr "Ù¾Ø±ÙÚÙ ØªÙØ±Ø ÛÚ© Ø³Ø§Ø²ÙØ§Ù ØºÛØ± Ø§ÙØªÙØ§Ø¹Û Ø¢Ù
Ø±ÛÚ©Ø§ÛÛ Ø¨Ø± Ø§Ø³Ø§Ø³ ÙÙØ§ÙÛÙ Ø³Ø±ÙÛØ³ Ø¯Ø±Ø¢ÙØ¯ Ø¯Ø§Ø®ÙÛ Ø¢Ù
Ø±ÛÚ©Ø§ Ø¨Ø§ Ú©Ø¯ 501(c)(3) ÙÛ Ø¨Ø§Ø´Ø¯. Ø±ÙÛÚ©Ø±Ø¯ Ø§ÛÙ Ù¾Ø±ÙÚÙØ 
Ø¯Ø± Ø²ÙÛÙÙ Ù¾ÚÙÙØ´Ø ØªÙØ³Ø¹Ù Ù Ø¢ÙÙØ²Ø´ Ø¯Ø±Ø¨Ø§Ø±Ù ÙØ§Ø´ÙØ§Ø³ 
Ø¨ÙØ¯Ù Ù ØÙØ§Ø¸Øª Ø§Ø² ØØ±ÛÙ Ø´Ø®ØµÛ Ø¯Ø± ÙØ¶Ø§Û Ø¢ÙÙØ§ÛÙ ÙÛ 
Ø¨Ø§Ø´Ø¯."
 
 msgid "Learn More "
 msgstr "Ø¨ÛØ´ØªØ± Ø¨Ø¯Ø§ÙÛØ¯ "
 
 msgid "Go"
-msgstr "Ø¨Ø±Ù"
+msgstr "ØªØ§ÛÛØ¯"
 
 msgid "Donate to Support Tor"
 msgstr "Ø¨Ø±Ø§Û Ù¾Ø´ØªÛØ¨Ø§ÙÛ Ù ØÙØ§ÛØª Ø§Ø² ØªÙØ± Ú©ÙÚ© ÙØ§ÙÛ 
Ú©ÙÛØ¯"

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

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

2019-09-19 Thread translation

commit 1d91bcb1527e0cab7555b1cecaef68d405550cad
Author: Translation commit bot 
Date:   Thu Sep 19 07:46:48 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
---
 code_of_conduct+fr.po | 737 ++
 1 file changed, 737 insertions(+)

diff --git a/code_of_conduct+fr.po b/code_of_conduct+fr.po
new file mode 100644
index 0..be7ece2d2
--- /dev/null
+++ b/code_of_conduct+fr.po
@@ -0,0 +1,737 @@
+# Code of conduct of the tor project
+# Copyright (C) 2019 tor project.
+# This Code of Conduct is licensed under a Creative Commons CC-BY-SA 4.0
+# International license.e.
+# FIRST AUTHOR , YEAR.
+# 
+# Translators:
+# David Georges, 2019
+# AO , 2019
+# robin Amielh , 2019
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Code of conduct of the Tor Project\n"
+"POT-Creation-Date: 2019-08-02 12:00+\n"
+"PO-Revision-Date: 2019-08-27 18:54+\n"
+"Last-Translator: robin Amielh , 2019\n"
+"Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:1 ../code_of_conduct.txt:24
+#: ../code_of_conduct.txt:51 ../code_of_conduct.txt:75
+#: ../code_of_conduct.txt:104 ../code_of_conduct.txt:180
+#: ../code_of_conduct.txt:193 ../code_of_conduct.txt:213
+#: ../code_of_conduct.txt:231 ../code_of_conduct.txt:243
+#: ../code_of_conduct.txt:253 ../code_of_conduct.txt:278
+#, no-wrap
+msgid "\n"
+msgstr "\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:3
+#, no-wrap
+msgid ""
+"Tor Project Code of Conduct\n"
+"\n"
+msgstr ""
+"Code de conduite du ProjetÂ Tor\n"
+"\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:6
+msgid "Statement of Intent:"
+msgstr "DÃ©claration d'intention:"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:10
+msgid ""
+"The Tor Project is committed to fostering an inclusive environment and "
+"community. Tor is a place where people should feel safe to engage, share "
+"their point of view, and participate."
+msgstr ""
+"Le ProjetÂ Tor est dÃ©terminÃ© Ã  promouvoir un environnement et une 
communautÃ© "
+"qui favorisent lâintÃ©gration. Tor est un lieu oÃ¹ les gens devraient avoir 
le"
+" sentiment de pouvoir sâimpliquer, partager leur point de vue et participer 
"
+"en toute sÃ©curitÃ©."
+
+#. type: Plain text
+#: ../code_of_conduct.txt:15
+msgid ""
+"This code of conduct applies to The Tor Project as a whole. It is intended "
+"to provide guidelines for contributors. Employees and contractors of The Tor"
+" Project, Inc. (TPI) are also subject to company policies and procedures. "
+"Those people should feel free to contact HR with questions or concerns."
+msgstr ""
+"Ce code de conduite sâapplique au projet Tor dans son ensemble. Il est "
+"destinÃ© Ã  fournir des lignes directrices aux contributeurs. Les employÃ©s 
et "
+"les sous-traitants de The Tor Project, Inc. (TPI) sont Ã©galement soumis aux "
+"politiques et procÃ©dures de la sociÃ©tÃ©. Ces personnes ne doivent pas 
hÃ©siter"
+" Ã  contacter les ressources humaines pour des questions ou des "
+"prÃ©occupations."
+
+#. type: Plain text
+#: ../code_of_conduct.txt:23
+msgid ""
+"This code of conduct is not exhaustive or complete. It is an ongoing effort "
+"to summarize our shared understanding. We want to provide a welcoming, safe "
+"environment, so we can work together to pursue powerful solutions. We "
+"reserve the right to deviate from strictly enforcing this code. Any "
+"deviations must produce an outcome which is fairer, and aligned with our "
+"values. We understand that keeping a living document relevant and 
âpatchedâ "
+"involves sustained effort."
+msgstr ""
+"Ce code de conduite n'est ni exhaustif ni complet. Câest un effort continu "
+"pour rÃ©sumer notre comprÃ©hension commune. Nous souhaitons crÃ©er un "
+"environnement accueillant et sÃ»r afin de pouvoir travailler ensemble afin de"
+" rechercher des solutions performantes. Nous nous rÃ©servons le droit de "
+"dÃ©roger Ã  l'application stricte de ce code. Toute dÃ©viation doit produire 
un"
+" rÃ©sultat plus juste et conforme Ã  nos valeurs. Nous comprenons que garder "
+"un document vivant pertinent et Â«patchÃ©Â» implique des efforts soutenus."
+
+#. type: Plain text
+#: ../code_of_conduct.txt:26
+#, no-wrap
+msgid ""
+"0. Summary: Don't be a jerk. Be awesome instead.\n"
+"\n"
+msgstr ""
+"0. RÃ©sumÃ©Â : Ne soyez idiot. Soyez plutÃ´t gÃ©nial.\n"
+"=\n"
+
+#. type: Plain

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

2019-09-19 Thread translation

commit ba8168f6b09efa5589e25259e1268670c5147fd5
Author: Translation commit bot 
Date:   Thu Sep 19 07:21:49 2019 +

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

diff --git a/fa/torcheck.po b/fa/torcheck.po
index 4e34b2121..35934163c 100644
--- a/fa/torcheck.po
+++ b/fa/torcheck.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2019-08-30 10:57+\n"
+"PO-Revision-Date: 2019-09-19 07:16+\n"
 "Last-Translator: MYZJ\n"
 "Language-Team: Persian 
(http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -71,10 +71,10 @@ msgstr "Ø¨Ø±Ø§Û Ø¢Ú¯Ø§ÙÛ Ø¨ÛØ´ØªØ± Ø¯Ø± ÙÙØ±Ø¯ Ø§ÛÙ 
Ú¯Ø±Ù Ù¾Ø§ÛØ§ÙÛ
 msgid ""
 "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, "
 "development, and education of online anonymity and privacy."
-msgstr "Ù¾Ø±ÙÚÙÙ ØªÙØ± Ø³Ø§Ø²ÙØ§Ù ØºÛØ± Ø§ÙØªÙØ§Ø¹Û Ø¢Ù
Ø±ÛÚ©Ø§ÛÛ 501(c)(3) ÙØ®ØªØµ Ù¾ÚÙÙØ´Ø ØªÙØ³Ø¹Ù Ù Ø¢ÙÙØ²Ø´ Ø¯Ø± Ø²Ù
ÛÙ ÙØ§Ø´ÙØ§Ø³Û Ù ØØ±ÛÙ Ø´Ø®ØµÛ Ø¢ÙÙØ§ÙÙ ÙØ³Øª."
+msgstr "Ù¾Ø±ÙÚÙ ØªÙØ±Ø ÛÚ© Ø³Ø§Ø²ÙØ§Ù ØºÛØ± Ø§ÙØªÙØ§Ø¹Û Ø¢Ù
Ø±ÛÚ©Ø§ÛÛ Ø¨Ø± Ø§Ø³Ø§Ø³ ÙÙØ§ÙÛÙ Ø³Ø±ÙÛØ³ Ø¯Ø±Ø¢ÙØ¯ Ø¯Ø§Ø®ÙÛ Ø¢Ù
Ø±ÛÚ©Ø§ Ø¨Ø§ Ú©Ø¯ 501(c)(3) ÙÛ Ø¨Ø§Ø´Ø¯.\nØ±ÙÛÚ©Ø±Ø¯ Ø§ÛÙ Ù¾Ø±ÙÚÙØ 
Ø¯Ø± Ø²ÙÛÙÙ Ù¾ÚÙÙØ´Ø ØªÙØ³Ø¹Ù Ù Ø¢ÙÙØ²Ø´ Ø¯Ø±Ø¨Ø§Ø±Ù ÙØ§Ø´ÙØ§Ø³ 
Ø¨ÙØ¯Ù Ù ØÙØ§Ø¸Øª Ø§Ø² ØØ±ÛÙ Ø´Ø®ØµÛ Ø¯Ø± ÙØ¶Ø§Û Ø¢ÙÙØ§ÛÙ ÙÛ 
Ø¨Ø§Ø´Ø¯."
 
 msgid "Learn More "
-msgstr "Ø¨ÛØ´ØªØ± Ø¨Ø¯Ø§ÙÛØ¯Â»"
+msgstr "Ø¨ÛØ´ØªØ± Ø¨Ø¯Ø§ÙÛØ¯ "
 
 msgid "Go"
 msgstr "Ø¨Ø±Ù"
@@ -83,7 +83,7 @@ msgid "Donate to Support Tor"
 msgstr "Ø¨Ø±Ø§Û Ù¾Ø´ØªÛØ¨Ø§ÙÛ Ù ØÙØ§ÛØª Ø§Ø² ØªÙØ± Ú©ÙÚ© ÙØ§ÙÛ 
Ú©ÙÛØ¯"
 
 msgid "Tor Q Site"
-msgstr "ØªØ§Ø±ÙÙØ§Û Ù¾Ø±Ø³Ø´ Ù Ù¾Ø§Ø³Ø® Tor"
+msgstr "ÙØ¨Ø³Ø§ÛØª Ù¾Ø±Ø³Ø´ Ù Ù¾Ø§Ø³Ø® ØªÙØ±"
 
 msgid "Volunteer"
 msgstr "Ø¯Ø§ÙØ·ÙØ¨"
@@ -95,13 +95,13 @@ msgid "JavaScript is disabled."
 msgstr "Ø¬Ø§ÙØ§ Ø§Ø³Ú©Ø±ÛÙ¾Øª ØºÛØ± ÙØ¹Ø§Ù Ø§Ø³Øª."
 
 msgid "However, it does not appear to be Tor Browser."
-msgstr "Ø¨Ø§ Ø§ÛÙ ØØ§ÙØ Ø¨Ù ÙØ¸Ø± ÙÙÛ Ø±Ø³Ø¯ Ø¨Ù ÙØ±ÙØ±Ú¯Ø± Tor."
+msgstr "Ø¨Ø§ Ø§ÛÙ ØØ§ÙØ Ø¨Ù ÙØ¸Ø± ÙÙÛ Ø±Ø³Ø¯ ÙØ±ÙØ±Ú¯Ø± ØªÙØ± 
Ø¨Ø§Ø´Ø¯."
 
 msgid "Run a Relay"
 msgstr "Ø§Ø¬Ø±Ø§Û ÛÚ© Ø±ÙÙ"
 
 msgid "Stay Anonymous"
-msgstr "ÙØ§Ø´ÙØ§Ø³ Ø¨ÙØ§Ù"
+msgstr "ÙØ§Ø´ÙØ§Ø³ Ø¨ÙØ§ÙÛØ¯"
 
 msgid "Relay Search"
-msgstr "Ø±ÙÙ Ø¬Ø³ØªØ¬Ù"
+msgstr "Ø¬Ø³ØªØ¬ÙÛ Ø±ÙÙ"

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

68 matches

Mail list logo