date:20200106

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

2020-01-06 Thread translation

commit ddcadad7d6fd14a7fb1be24aa3e091440e0a5d9e
Author: Translation commit bot 
Date:   Tue Jan 7 03:45:58 2020 +

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

diff --git a/vi/https-everywhere.dtd b/vi/https-everywhere.dtd
index 9ce598d51c..59da632b56 100644
--- a/vi/https-everywhere.dtd
+++ b/vi/https-everywhere.dtd
@@ -26,8 +26,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -42,14 +42,14 @@
 
 
 
-
+
 
-
-
+
+
 
-
-
-
+
+
+
 
 
 

___
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

2020-01-06 Thread translation

commit 7a6c15f767f4969d601c8fccfbe1f46e049148ae
Author: Translation commit bot 
Date:   Mon Jan 6 23:51:07 2020 +

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

diff --git a/contents+ja.po b/contents+ja.po
index 4433b3671a..ed570022b7 100644
--- a/contents+ja.po
+++ b/contents+ja.po
@@ -8,8 +8,8 @@
 # 323484, 2019
 # h345u37g3 h345u37g3, 2019
 # 987 pluto , 2019
-# Agent Exe , 2019
 # maruyuki , 2019
+# Agent Exe , 2020
 # 
 msgid ""
 msgstr ""
@@ -17,7 +17,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-11-29 10:58+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: maruyuki , 2019\n"
+"Last-Translator: Agent Exe , 2020\n"
 "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -692,6 +692,8 @@ msgid ""
 "bridges by Internet scanning. obfs4 bridges are less likely to be blocked "
 "than its predecessor, obfs3 bridges."
 msgstr ""
+"obfs4ã¯ãTorã®ãã©ãã£ãã¯ãTorãããã¯ã¼ã¯ã®å¤ãããã©ã³ãã
 ã«è¦ããããã«ãã¦ãæ¤é²è
ãã¤ã³ã¿ã¼ãããã¹ãã£ã³ã«ãã£ã¦ããªãã¸ãè¦ã¤ããã®ãé²ãã¾ãã\n"
+"obfs4ããªãã¸ã¯ããã®åèº«ã§ããobfs3ããªãã¸ãããçºè¦ãããããããã³ã°ãããå¯è½æ§ãä½ããªã£ã¦ãã¾ãã"
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)

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

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

2020-01-06 Thread translation

commit 4d9fddb00747993542a472cc3f8300cf4ede3336
Author: Translation commit bot 
Date:   Mon Jan 6 23:24:24 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md
---
 tor-outreach2019-2020-fa.md | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tor-outreach2019-2020-fa.md b/tor-outreach2019-2020-fa.md
index ce7cec0a48..08a381755c 100644
--- a/tor-outreach2019-2020-fa.md
+++ b/tor-outreach2019-2020-fa.md
@@ -29,9 +29,9 @@ If this website was linked back to them, they could be 
arrested--or worse.
 
 To protect themselves, Fernanda and her colleagues created the website using 
Tor **onion services**. Onion services not only protect them from being 
discovered as the operators of the server but also help protect visitors to 
their website by requiring they use Tor Browser. 
 
-In fact, Fernanda uses **Tor Browser** for all of her web browsing just to be 
on the safe side.
+Ø¯Ø± ÙØ§ÙØ¹ ÙØ±ÙØ§ÙØ¯Ø§ Ø§Ø² **ÙØ±ÙØ±Ú¯Ø± ØªÙØ±** Ø¨Ø±Ø§Û ØªÙØ§Ù 
Ú©Ø§Ø± ÙØ§Û Ø¬Ø³ØªØ¬ÙÛ Ø®ÙØ¯ Ø§Ø³ØªÙØ§Ø¯Ù ÙÛ Ú©ÙØ¯ ØªØ§ Ø§ÙÙ ØªØ± 
Ø¨Ø§Ø´Ø¯
 
-She also uses a Tor-powered app called **OnionShare** to send files to other 
activists securely and privately. 
+Ø§Ù Ø§Ø² ÛÚ© ÙØ±Ù Ø§ÙØ²Ø§Ø± Ø¨Ø± Ù¾Ø§ÛÙ Ø¨Ø±ÙØ§ÙÙ ØªÙØ± Ø¨Ù ÙØ§Ù 
Ø¢ÙÛÙÙ Ø´ÛØ± **OnionShare** Ø§Ø³ØªÙØ§Ø¯Ù ÙÛ Ú©ÙØ¯ ØªØ§ ÙØ§ÛÙ ÙØ§ 
Ø±Ø§ Ø¨Ù Ø¯ÛÚ¯Ø± Ø§Ú©ØªÛÙÛØ³Øª ÙØ§ Ø¨ØµÙØ±Øª Ø§ÙÙ Ø§Ø±Ø³Ø§Ù Ú©ÙØ¯
 
 ### ÙØ¹Ø§ÙÛÙ ØÙÙÙ Ø¨Ø§Ø±ÙØ±Û ÙØ§ÙÙØ¯ ÙØ±ÙØ§ÙØ¯Ø§Ø Ø¨Ø±Ø§Û 
Ø¢Ø²Ø§Ø¯ÛâÙØ§Û Ø§Ø³Ø§Ø³Û ÙØ¨Ø§Ø±Ø²Ù ÙÛâÚ©ÙÙØ¯ Ù ØªÙØ± Ø¨Ù 
ÙØ¯Ø±Øª ÙÙØ§ÙÙØª Ø¢ÙâÙØ§ Ú©ÙÚ© ÙÛâÚ©ÙØ¯.
 
@@ -39,7 +39,7 @@ She also uses a Tor-powered app called **OnionShare** to send 
files to other act
 
 # 3. ØªÙØ± Ø¨Ø±Ø§Û ØÙÙÙ Ø¨Ø´Ø±
 
-### Water is life 
+### Ø¢Ø¨ Ø²ÙØ¯Ú¯ÛØ³Øª
 
 Jelani Ø¯Ø± Ø±ÙØ³ØªØ§ÛÛ Ú©ÙÚÚ©Û Ø²ÙØ¯Ú¯Û ÙÛâÚ©ÙØ¯ Ú©Ù 
Ø±ÙØ¯Ø®Ø§ÙÙ ÙØ³ÛØ¹Û Ø§Ø² Ø¢Ù Ø¹Ø¨ÙØ± ÙÛâÚ©ÙØ¯.
 
@@ -59,13 +59,13 @@ All of this software uses Tor to help protect Jelaniâs 
privacy.
 
 ---
 
-# 4. TOR FOR ANTI-CENSORSHIP
+# 4. ØªÙØ± Ø¨Ø±Ø§Û Ø¬ÙÙÚ¯ÛØ±Û Ø§Ø² ÙÛÙØªØ±ÛÙÚ¯ Ù Ø³Ø§ÙØ³ÙØ±Û
 
-### Build bridges not walls
+### Ø¨Ø¬Ø§Û Ø³Ø§Ø®ØªÙ Ø¯ÛÙØ§Ø± ÙØ§ Ù¾Ù ÙØ§ Ø±Ø§ Ø¨Ø³Ø§Ø²ÛØ¯
 
 Jean was traveling for the first time to a country far from his family.
 
-After arriving at a hotel, he opened his laptop.
+Ù¾Ø³ Ø§Ø² ÙØ±ÙØ¯ Ø¨Ù ÙØªÙ Ø ÙÙ¾ØªØ§Ù¾Ø´ Ø±Ø§ Ø¨Ø§Ø² Ú©Ø±Ø¯
 
 He was so exhausted that when the message "Connection has timed out" first 
appeared on his web browser, he thought it was due to his own error.
 
@@ -91,7 +91,7 @@ With Tor Browser, Jean can browse freely and privately and 
contact his family.
 
 ---
 
-# 5. Shared Sections
+# Ø¨Ø®Ø´ ÙØ§Û Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±Û Ø´Ø¯Ù
 
 ## ØªÙØ± ÚÛØ³ØªØ
 
@@ -104,7 +104,7 @@ When you use Tor Browser, no one can see what websites you 
visit or where in the
 Other applications, like SecureDrop and OnionShare, use Tor to protect their 
users against surveillance and censorship.
 
 
-## 6. How does Tor work?
+## ØªÙØ± ÚØ·ÙØ± Ú©Ø§Ø± ÙÛ Ú©ÙØ¯Ø
 
 Amal wants to visit Bekeleâs website privately, so she opens Tor Browser.
 
@@ -136,7 +136,7 @@ Tor relay operators cannot reveal the true identity of Tor 
users.
 
 Continual peer review of Tor's source code by academic and open source 
communities ensures that there are no backdoors in Tor, and our social contract 
promises that we will never backdoor Tor. 
 
-## 7. Join the Tor community
+## 7. Ø¨Ù Ø§ÙØ¬ÙÙ ØªÙØ± Ø¨Ù¾ÛÙÙØ¯ÛØ¯
 
 Tor is made possible by a diverse set of users, developers, relay operators, 
and advocates from around the world.
 
@@ -149,9 +149,9 @@ The Tor community is governed by a code of conduct, and we 
outline our set of pr
 Learn more about Tor by visiting our website, our wiki, finding us on IRC, 
joining one of our mailing lists, or signing up for Tor News at 
newsletter.torproject.org.
 
 
-## 8. Download Tor
+## 8. Ø¯Ø±ÛØ§ÙØª ØªÙØ±
 
-Tor for Desktop
+ØªÙØ± Ø¨Ø±Ø§Û Ø¯Ø³Ú©ØªØ§Ù¾ 
 torproject.org/download
 
 ØªÙØ± Ø¨Ø±Ø§Û ÙÙØ¨Ø§ÛÙ

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

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

2020-01-06 Thread translation

commit 6bada26bb85ce2815d2e6a621541e2dfb13f0f32
Author: Translation commit bot 
Date:   Mon Jan 6 23:19:28 2020 +

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

diff --git a/pt_BR.po b/pt_BR.po
index d686d21dab..1e0021f4ed 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -6,6 +6,7 @@
 # Alexei GonÃ§alves de Oliveira , 2018
 # Communia , 2013-2018
 # carlo giusepe tadei valente sasaki , 2014
+# C. E., 2020
 # C. E., 2019
 # C. E., 2019
 # Danton Medrado, 2015
@@ -33,8 +34,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-01-06 11:20+0100\n"
-"PO-Revision-Date: 2020-01-06 13:47+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2020-01-06 23:03+\n"
+"Last-Translator: C. 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"

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

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

2020-01-06 Thread translation

commit 7370d89edcd30785ac4f1c3a7d1e360d5e73654b
Author: Translation commit bot 
Date:   Mon Jan 6 23:17:31 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 pt_BR.po | 103 ---
 1 file changed, 52 insertions(+), 51 deletions(-)

diff --git a/pt_BR.po b/pt_BR.po
index a0b8902427..f26111ffd2 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -6,6 +6,7 @@
 # Alexei GonÃ§alves de Oliveira , 2018
 # Communia , 2013-2018
 # carlo giusepe tadei valente sasaki , 2014
+# C. E., 2020
 # C. E., 2019
 # C. E., 2019
 # Danton Medrado, 2015
@@ -33,8 +34,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-01-06 11:20+0100\n"
-"PO-Revision-Date: 2020-01-06 13:47+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2020-01-06 23:03+\n"
+"Last-Translator: C. 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"
@@ -126,7 +127,7 @@ msgstr "_SaÃda"
 msgid ""
 "For debugging information, execute the following command: sudo tails-"
 "debugging-info"
-msgstr ""
+msgstr "Para informaÃ§Ãµes sobre depuraÃ§Ã£o, executar o seguinte comando: 
sudo tails-debugging-info"
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:244
 msgid ""
@@ -135,15 +136,15 @@ msgid ""
 "website.\\n\\nCheck your network connection, and restart Tails to try "
 "upgrading again.\\n\\nIf the problem persists, go to "
 "file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
-msgstr ""
+msgstr "Ocorreu um erro ao atualizar a chave de 
assinatura.\\n\\nIsso evita determinar se uma atualizaÃ§Ã£o estÃ¡ 
disponÃvel em nosso site.\\n\\nVerifique sua conexÃ£o de rede e reinicie o 
Tails para tentar atualizar novamente.\\n\\nSe o problema persistir, vÃ¡ para 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:250
 msgid "Error while updating the signing key"
-msgstr ""
+msgstr "Erro ao atualizar a chave de assinatura"
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:279
 msgid "Error while checking for upgrades"
-msgstr ""
+msgstr "Erro ao verificar as atualizaÃ§Ãµes"
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:282
 msgid ""
@@ -152,64 +153,64 @@ msgid ""
 "Check your network connection, and restart Tails to try upgrading again.\n"
 "\n"
 "If the problem persists, go to 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
-msgstr ""
+msgstr "NÃ£o foi possÃvel determinar se uma atualizaÃ§Ã£o estÃ¡ 
disponÃvel em nosso website.\n\nVerifique sua conexÃ£o de rede e reinicie 
o Tails para tentar atualizar novamente.\n\nCaso o problema persista, consulte 
o arquivo:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:297
 msgid "no automatic upgrade is available from our website for this version"
-msgstr ""
+msgstr "No nosso website, nenhuma atualizaÃ§Ã£o automÃ¡tica para essa versÃ£o 
estÃ¡ disponÃvel"
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:303
 msgid "your device was not created using a USB image or Tails Installer"
-msgstr ""
+msgstr "seu dispositivo nÃ£o foi criado usando uma imagem USB ou o Tails 
Installer"
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:308
 msgid "Tails was started from a DVD or a read-only device"
-msgstr ""
+msgstr "O Tails foi inciado a partir de um DVD ou de um dispositivo somente de 
leitura"
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:313
 msgid "there is not enough free space on the Tails system partition"
-msgstr ""
+msgstr "nÃ£o hÃ¡ espaÃ§o livre suficiente na partiÃ§Ã£o do sistema do Tails"
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:318
 msgid "not enough memory is available on this system"
-msgstr ""
+msgstr "nÃ£o hÃ¡ memÃ³ria suficiente disponÃvel nesse sistema"
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:324
 #, perl-brace-format
 msgid "No explanation available for reason '%{reason}s'."
-msgstr ""
+msgstr "Nenhuma explicaÃ§Ã£o disponÃvel para o motivo '%{reason}s'."
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:345
 msgid "The system is up-to-date"
-msgstr ""
+msgstr "O sistema estÃ¡ atualizado"
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:350
 msgid "This version of Tails is outdated, and may have security issues."
-msgstr ""
+msgstr "Esta versÃ£o do Tails estÃ¡ desatualizada e pode ter problemas de 
seguranÃ§a."
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:382
 #, perl-brace-format
 msgid ""
 "The available incremental upgrade requires %{space_needed}s of free

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

2020-01-06 Thread translation

commit eb8487883af4537a9f99e0204840b031c4a89b70
Author: Translation commit bot 
Date:   Mon Jan 6 23:15:33 2020 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/fa/LC_MESSAGES/messages.po | 119 +++---
 1 file changed, 61 insertions(+), 58 deletions(-)

diff --git a/locale/fa/LC_MESSAGES/messages.po 
b/locale/fa/LC_MESSAGES/messages.po
index bab758ecb2..cb829d1f3a 100644
--- a/locale/fa/LC_MESSAGES/messages.po
+++ b/locale/fa/LC_MESSAGES/messages.po
@@ -17,10 +17,11 @@
 # Samaneh M , 2019
 # A.Mehraban , 2019
 # magnifico, 2019
+# AmirAli Dabouei , 2020
 # 
 msgid ""
 msgstr ""
-"Last-Translator: magnifico, 2019\n"
+"Last-Translator: AmirAli Dabouei , 2020\n"
 "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n"
 "Language: fa\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -199,6 +200,8 @@ msgid ""
 "The Tor Project very much appreciates all its donors. "
 "Thank you for supporting Tor."
 msgstr ""
+"Ù¾Ø±ÙÚÙ Ø´Ø¨Ú©Ù ØªÙØ± ØªÙØ§ÙÛ ØÙØ§ÛØª 
ÙØ§Ø±Ø§ ÙØ¯Ø±Ø¯Ø§Ù Ø§Ø³Øª. ÙÙÙÙÙÛÙ Ø§Ø² "
+"ØÙØ§ÛØª Ø´ÙØ§"
 
 #: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:113
 #: 
tmp/cache_locale/c8/c806c3e41d2762077fdd1ce236b4b0b7dc838a7c1a428d6d6daeede2a01d35aa.php:134
@@ -375,23 +378,23 @@ msgstr ""
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:166
 msgid "Copied"
-msgstr ""
+msgstr "Ú©Ù¾Û Ø´Ø¯"
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:170
 msgid "Currency Amount must be a number."
-msgstr ""
+msgstr "ÙÙØ¯Ø§Ø± ÙØ§ØØ¯ Ù¾ÙÙ Ø¨Ø§ÛØ¯ ÛÚ© Ø¹Ø¯Ø¯ Ø¨Ø§Ø´Ø¯"
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:174
 #: 
tmp/cache_locale/a1/a1384b9a21e3d43e946972b01389567dff845ee982dcf05228aa3e5096a74210.php:69
 #: 
tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:51
 msgid "Choose a Currency"
-msgstr ""
+msgstr "ÛÚ© ÙØ§ØØ¯ Ù¾ÙÙ Ø±Ø§ Ø§ÙØªØ®Ø§Ø¨ Ú©ÙÛØ¯"
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:178
 #: 
tmp/cache_locale/a1/a1384b9a21e3d43e946972b01389567dff845ee982dcf05228aa3e5096a74210.php:91
 #: 
tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:73
 msgid "Currency Amount"
-msgstr ""
+msgstr "ÙÙØ¯Ø§Ø± ÙØ§ØØ¯ Ù¾ÙÙ"
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:180
 msgid "Estimated Donation Date"
@@ -399,7 +402,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:184
 msgid "I'd like to make my donation anonymous."
-msgstr ""
+msgstr "ÙÙ Ø¹ÙØ§ÙÙ ÙÙØ¯Ù Ú©Ù ØÙØ§ÛØª ÙØ§ÛÙ Ø±Ø§ Ø¨ØµÙØ±Øª 
ÙØ§Ø´ÙØ§Ø³ Ø§ÙØ¬Ø§Ù Ø¯ÙÙ"
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:188
 #: 
tmp/cache_locale/a1/a1384b9a21e3d43e946972b01389567dff845ee982dcf05228aa3e5096a74210.php:64
@@ -427,7 +430,7 @@ msgstr "ÙØ§Ù Ø®Ø§ÙÙØ§Ø¯Ú¯Û"
 #: 
tmp/cache_locale/a1/a1384b9a21e3d43e946972b01389567dff845ee982dcf05228aa3e5096a74210.php:98
 #: 
tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:80
 msgid "Report Donation"
-msgstr ""
+msgstr "Ú¯Ø²Ø§Ø±Ø´ ØÙØ§ÛØª ÙØ§ÙÛ"
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:204
 #: 
tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:370
@@ -475,7 +478,7 @@ msgstr ""
 #: 
tmp/cache_locale/60/60fb10a60dd92fe380a6d105fd68d9375e135c65251f204fa37158d9c2e655d9.php:73
 #: 
tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:70
 msgid "You should receive an email receipt shortly."
-msgstr ""
+msgstr "Ø´ÙØ§ Ø¨Ø§ÛØ¯ ÛÚ© Ø§ÛÙÛÙ ØØ§ÙÛ Ø±Ø³ÛØ¯ Ø¯Ø±ÛØ§ÙØª 
Ú©ÙÛØ¯."
 
 #: 
tmp/cache_locale/ca/ca1cd152d40544030a642d8d074e6afb769c3bf80a1b2b61c380f1466e3a03a4.php:55
 #: 
tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:55
@@ -530,7 +533,7 @@ msgstr "Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±Û Ù¾Ø±ÙÚÙ ØªÙØ±"
 #: 
tmp/cache_locale/60/60fb10a60dd92fe380a6d105fd68d9375e135c65251f204fa37158d9c2e655d9.php:166
 #: 
tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:109
 msgid "Got Skills?"
-msgstr ""
+msgstr "ÙÙØ§Ø±ØªÛ Ø¯Ø§Ø±ÛØ¯Ø"
 
 #: 
tmp/cache_locale/ca/ca1cd152d40544030a642d8d074e6afb769c3bf80a1b2b61c380f1466e3a03a4.php:151
 #: 
tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:121
@@ -553,7 +556,7 @@ msgstr ""
 #: 
tmp/cache_locale/60/60fb10a60dd92fe380a6d105fd68d9375e135c65251f204fa37158d9c2e655d9.php:180
 #: 
tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:123
 msgid "Learn

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

2020-01-06 Thread translation

commit 039f0591620fc09da97cb3b4daf9c3c15373a403
Author: Translation commit bot 
Date:   Mon Jan 6 22:51:01 2020 +

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

diff --git a/contents+fa.po b/contents+fa.po
index 7a8830017b..0ed7210cd1 100644
--- a/contents+fa.po
+++ b/contents+fa.po
@@ -9,6 +9,7 @@
 # Emma Peel, 2019
 # MYZJ, 2019
 # Samaneh M , 2019
+# AmirAli Dabouei , 2020
 # 
 msgid ""
 msgstr ""
@@ -16,7 +17,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-11-29 10:58+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Samaneh M , 2019\n"
+"Last-Translator: AmirAli Dabouei , 2020\n"
 "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2583,7 +2584,7 @@ msgstr "ÙØ§Ù Ú©Ø§Ø±Ø¨Ø±Û Ù Ø±ÙØ² Ø¹Ø¨ÙØ± 
Ø§Ø³ØªÙØ§Ø¯Ù Ø´Ø¯Ù Ø¨Ø±Ø§Û Ø§
 #: lego/templates/secure-connections.html:51
 #: templates/secure-connections.html:51
 msgid "data"
-msgstr "data"
+msgstr "Ø¯Ø§Ø¯Ù"
 
 #: lego/templates/secure-connections.html:54
 #: templates/secure-connections.html:54
@@ -2593,7 +2594,7 @@ msgstr "Ø§Ø·ÙØ§Ø¹Ø§ØªÛ Ú©Ù ÙÙØªÙÙ ÙÛ Ø´ÙÙØ¯."
 #: lego/templates/secure-connections.html:58
 #: templates/secure-connections.html:58
 msgid "location"
-msgstr "location"
+msgstr "ÙÙÙØ¹ÛØª Ø¬ØºØ±Ø§ÙÛØ§ÛÛ"
 
 #: lego/templates/secure-connections.html:61
 #: templates/secure-connections.html:61

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

[tor-commits] [tor/master] doc: Add TCPProxy option

2020-01-06 Thread nickm

commit 1b07a2d7bf8cc868e2d904191e8c30b48b7ac216
Author: Suphanat Chunhapanya 
Date:   Tue Aug 20 16:18:24 2019 +0800

doc: Add TCPProxy option

TCPProxy is used for proxying all outgoing OR connections through some
proxy with the protocol specified in the option.
---
 doc/tor.1.txt | 16 
 1 file changed, 16 insertions(+)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 06bf022b1..5bcb6ec2b 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -647,6 +647,22 @@ GENERAL OPTIONS
 in accordance to RFC 1929. Both username and password must be between 1 and
 255 characters.
 
+[[TCPProxy]] **TCPProxy** __protocol__ __host__:__port__::
+   Tor will use the given protocol to make all its OR (SSL) connections 
through
+   a TCP proxy on host:port, rather than connecting directly to servers. 
You may
+   want to set **FascistFirewall** to restrict the set of ports you might 
try to
+   connect to, if your proxy only allows connecting to certain ports. 
There is no
+   equivalent option for directory connections, because all Tor client 
versions
+   that support this option download directory documents via OR 
connections. +
++
+   The only protocol supported right now 'haproxy'. This option is only for
+   clients. (Default: none) +
++
+   The HAProxy version 1 proxy protocol is described in detail at
+   https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt +
++
+   Both source IP address and source port will be set to zero.
+
 [[UnixSocksGroupWritable]] **UnixSocksGroupWritable** **0**|**1**::
 If this option is set to 0, don't allow the filesystem group to read and
 write unix sockets (e.g. SocksPort unix:). If the option is set to 1, make



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

[tor-commits] [tor/master] circuit: Implement haproxy

2020-01-06 Thread nickm

commit 119004e87d6303de5e90e7dfad87dd89bae6bd5f
Author: Suphanat Chunhapanya 
Date:   Fri Aug 23 11:44:49 2019 +0800

circuit: Implement haproxy
---
 src/core/include.am|  2 ++
 src/core/mainloop/connection.c | 48 +-
 src/core/mainloop/connection.h |  4 ++-
 src/core/or/connection_or.c| 15 +-
 src/core/or/or.h   |  5 ++--
 src/core/or/or_connection_st.h |  2 +-
 src/core/proto/.may_include|  6 +++-
 src/core/proto/proto_haproxy.c | 45 
 src/core/proto/proto_haproxy.h | 12 
 src/feature/control/btrack_orconn_cevent.c |  1 +
 10 files changed, 133 insertions(+), 7 deletions(-)

diff --git a/src/core/include.am b/src/core/include.am
index 9b4b251c8..8f455c177 100644
--- a/src/core/include.am
+++ b/src/core/include.am
@@ -63,6 +63,7 @@ LIBTOR_APP_A_SOURCES =\
src/core/proto/proto_cell.c \
src/core/proto/proto_control0.c \
src/core/proto/proto_ext_or.c   \
+   src/core/proto/proto_haproxy.c  \
src/core/proto/proto_http.c \
src/core/proto/proto_socks.c\
src/feature/api/tor_api.c   \
@@ -295,6 +296,7 @@ noinst_HEADERS +=   \
src/core/proto/proto_cell.h \
src/core/proto/proto_control0.h \
src/core/proto/proto_ext_or.h   \
+   src/core/proto/proto_haproxy.h  \
src/core/proto/proto_http.h \
src/core/proto/proto_socks.h\
src/feature/api/tor_api_internal.h  \
diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c
index c135bf395..de91b93cb 100644
--- a/src/core/mainloop/connection.c
+++ b/src/core/mainloop/connection.c
@@ -83,6 +83,7 @@
 #include "core/or/reasons.h"
 #include "core/or/relay.h"
 #include "core/or/crypt_path.h"
+#include "core/proto/proto_haproxy.h"
 #include "core/proto/proto_http.h"
 #include "core/proto/proto_socks.h"
 #include "feature/client/dnsserv.h"
@@ -2317,7 +2318,11 @@ conn_get_proxy_type(const connection_t *conn)
 return PROXY_SOCKS4;
   else if (options->Socks5Proxy)
 return PROXY_SOCKS5;
-  else
+  else if (options->TCPProxy) {
+/* The only supported protocol in TCPProxy is haproxy. */
+tor_assert(options->TCPProxyProtocol == TCP_PROXY_PROTOCOL_HAPROXY);
+return PROXY_HAPROXY;
+  } else
 return PROXY_NONE;
 }
 
@@ -2489,6 +2494,35 @@ connection_socks5_proxy_connect(connection_t *conn)
   return 0;
 }
 
+/** Write a proxy request of haproxy to conn for conn->addr:conn->port.
+ *
+ * Returns -1 if conn->addr is incompatible with the proxy protocol, and
+ * 0 otherwise.
+ */
+static int
+connection_haproxy_proxy_connect(connection_t *conn)
+{
+  int ret = 0;
+  tor_addr_port_t *addr_port = tor_addr_port_new(>addr, conn->port);
+  char *buf = haproxy_format_proxy_header_line(addr_port);
+
+  if (buf == NULL) {
+ret = -1;
+goto done;
+  }
+
+  connection_buf_add(buf, strlen(buf), conn);
+  /* In haproxy, we don't have to wait for the response, but we wait for ack.
+   * So we can set the state to be PROXY_HAPROXY_WAIT_FOR_FLUSH. */
+  conn->proxy_state = PROXY_HAPROXY_WAIT_FOR_FLUSH;
+
+  ret = 0;
+ done:
+  tor_free(buf);
+  tor_free(addr_port);
+  return ret;
+}
+
 /** Write a proxy request of type (socks4, socks5, https, haproxy)
  * to conn for conn->addr:conn->port, authenticating with the auth details
  * given in the configuration (if available). SOCKS 5 and HTTP CONNECT
@@ -2519,6 +2553,10 @@ connection_proxy_connect(connection_t *conn, int type)
   ret = connection_socks5_proxy_connect(conn);
   break;
 
+case PROXY_HAPROXY:
+  ret = connection_haproxy_proxy_connect(conn);
+  break;
+
 default:
   log_err(LD_BUG, "Invalid proxy protocol, %d", type);
   tor_fragile_assert();
@@ -5498,6 +5536,13 @@ get_proxy_addrport(tor_addr_t *addr, uint16_t *port, int 
*proxy_type,
 *port = options->Socks5ProxyPort;
 *proxy_type = PROXY_SOCKS5;
 return 0;
+  } else if (options->TCPProxy) {
+tor_addr_copy(addr, >TCPProxyAddr);
+*port = options->TCPProxyPort;
+/* The only supported protocol in TCPProxy is haproxy. */
+tor_assert(options->TCPProxyProtocol == TCP_PROXY_PROTOCOL_HAPROXY);
+*proxy_type = PROXY_HAPROXY;
+return 0;
   }
 
   tor_addr_make_unspec(addr);
@@ -5535,6 +5580,7 @@ proxy_type_to_string(int proxy_type)
   case PROXY_CONNECT:   return "HTTP";
   case PROXY_SOCKS4:return "SOCKS4";
   case PROXY_SOCKS5:return "SOCKS5";
+  case PROXY_HAPROXY:   return "HAPROXY";
   case PROXY_PLUGGABLE: return "pluggable transports SOCKS";
   case PROXY_NONE:  return "NULL";
   default:

[tor-commits] [tor/master] test: HAPRoxy protocol

2020-01-06 Thread nickm

commit de58a49a2db20638823a77a1fb4c7f913f4f2169
Author: Suphanat Chunhapanya 
Date:   Mon Oct 21 18:00:02 2019 +0800

test: HAPRoxy protocol
---
 src/core/or/connection_or.c | 11 ++
 src/core/or/connection_or.h |  7 
 src/test/test_connection.c  | 77 --
 src/test/test_connection.h  |  1 +
 src/test/test_helpers.c | 81 +
 src/test/test_helpers.h |  3 ++
 6 files changed, 169 insertions(+), 11 deletions(-)

diff --git a/src/core/or/connection_or.c b/src/core/or/connection_or.c
index d9db17ef7..31b821088 100644
--- a/src/core/or/connection_or.c
+++ b/src/core/or/connection_or.c
@@ -95,13 +95,6 @@ static unsigned int
 connection_or_is_bad_for_new_circs(or_connection_t *or_conn);
 static void connection_or_mark_bad_for_new_circs(or_connection_t *or_conn);
 
-/*
- * Call this when changing connection state, so notifications to the owning
- * channel can be handled.
- */
-
-static void connection_or_change_state(or_connection_t *conn, uint8_t state);
-
 static void connection_or_check_canonicity(or_connection_t *conn,
int started_here);
 
@@ -457,8 +450,8 @@ connection_or_state_publish(const or_connection_t *conn, 
uint8_t state)
  * be notified.
  */
 
-static void
-connection_or_change_state(or_connection_t *conn, uint8_t state)
+MOCK_IMPL(STATIC void,
+connection_or_change_state,(or_connection_t *conn, uint8_t state))
 {
   tor_assert(conn);
 
diff --git a/src/core/or/connection_or.h b/src/core/or/connection_or.h
index 272f536b8..9d414254a 100644
--- a/src/core/or/connection_or.h
+++ b/src/core/or/connection_or.h
@@ -134,6 +134,13 @@ void connection_or_group_set_badness_(smartlist_t *group, 
int force);
 #ifdef CONNECTION_OR_PRIVATE
 STATIC int should_connect_to_relay(const or_connection_t *or_conn);
 STATIC void note_or_connect_failed(const or_connection_t *or_conn);
+
+/*
+ * Call this when changing connection state, so notifications to the owning
+ * channel can be handled.
+ */
+MOCK_DECL(STATIC void,connection_or_change_state,
+  (or_connection_t *conn, uint8_t state));
 #endif
 
 #ifdef TOR_UNIT_TESTS
diff --git a/src/test/test_connection.c b/src/test/test_connection.c
index ebe7c6d36..36543b3af 100644
--- a/src/test/test_connection.c
+++ b/src/test/test_connection.c
@@ -10,6 +10,7 @@
 #include "core/or/or.h"
 #include "test/test.h"
 
+#include "app/config/or_options_st.h"
 #include "core/mainloop/connection.h"
 #include "core/or/connection_edge.h"
 #include "feature/hs/hs_common.h"
@@ -312,6 +313,31 @@ test_conn_download_status_teardown(const struct testcase_t 
*tc, void *arg)
   return rv;
 }
 
+static void *
+test_conn_proxy_connect_setup(const struct testcase_t *tc)
+{
+  tcp_proxy_protocol_t proxy_type = (tcp_proxy_protocol_t)tc->setup_data;
+  switch (proxy_type) {
+case TCP_PROXY_PROTOCOL_HAPROXY:
+  return test_conn_get_proxy_or_connection(PROXY_HAPROXY);
+default:
+  return NULL;
+  }
+}
+
+static int
+test_conn_proxy_connect_teardown(const struct testcase_t *tc, void *arg)
+{
+  (void)tc;
+  or_connection_t *conn = arg;
+
+  tt_assert(conn);
+  assert_connection_ok(>base_, time(NULL));
+
+ done:
+  return 1;
+}
+
 /* Like connection_ap_make_link(), but does much less */
 static connection_t *
 test_conn_get_linked_connection(connection_t *l_conn, uint8_t state)
@@ -360,6 +386,10 @@ static struct testcase_setup_t 
test_conn_download_status_st = {
   test_conn_download_status_setup, test_conn_download_status_teardown
 };
 
+static struct testcase_setup_t test_conn_proxy_connect_st = {
+  test_conn_proxy_connect_setup, test_conn_proxy_connect_teardown
+};
+
 static void
 test_conn_get_basic(void *arg)
 {
@@ -788,6 +818,45 @@ test_conn_download_status(void *arg)
   /* the teardown function removes all the connections in the global list*/;
 }
 
+static int handshake_start_called = 0;
+
+static int
+handshake_start(or_connection_t *conn, int receiving)
+{
+  (void)receiving;
+
+  tor_assert(conn);
+
+  handshake_start_called = 1;
+  return 0;
+}
+
+static void
+test_conn_haproxy_proxy_connect(void *arg)
+{
+  size_t sz;
+  char *buf = NULL;
+  or_connection_t *conn = arg;
+
+  MOCK(connection_or_change_state, mock_connection_or_change_state);
+  MOCK(connection_tls_start_handshake, handshake_start);
+
+  tt_int_op(conn->base_.proxy_state, OP_EQ, PROXY_HAPROXY_WAIT_FOR_FLUSH);
+
+  buf = buf_get_contents(conn->base_.outbuf, );
+  tt_str_op(buf, OP_EQ, "PROXY TCP4 0.0.0.0 127.0.0.1 0 12345\r\n");
+
+  connection_or_finished_flushing(conn);
+
+  tt_int_op(conn->base_.proxy_state, OP_EQ, PROXY_CONNECTED);
+  tt_int_op(handshake_start_called, OP_EQ, 1);
+
+ done:
+  UNMOCK(connection_or_change_state);
+  UNMOCK(connection_tls_start_handshake);
+  tor_free(buf);
+}
+
 static node_t test_node;
 
 static node_t *
@@ -892,10 +961,14 @@ struct testcase_t connection_tests[] = {
   CONNECTION_TESTCASE(get_basic, TT_FORK,

[tor-commits] [tor/master] circuit: Add change file

2020-01-06 Thread nickm

commit 14d781fff6bd88c4e0cd5b741629c3e79c8612d9
Author: Suphanat Chunhapanya 
Date:   Mon Dec 2 15:24:44 2019 +0800

circuit: Add change file
---
 changes/ticket31518 | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/changes/ticket31518 b/changes/ticket31518
new file mode 100644
index 0..8deac56b9
--- /dev/null
+++ b/changes/ticket31518
@@ -0,0 +1,6 @@
+  o Major features (proxy):
+- In addition to HTTP CONNECT, SOCKS4, and SOCKS5, Tor can make all OR
+  connections through the HAProxy server. A new torrc option was added to
+  specify the address/port of the server: TCPProxy 
+  :. Currently the only supported protocol in the option is
+  haproxy. Close ticket 31518. Patch done by Suphanat Chunhapanya 
(haxxpop).



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

[tor-commits] [tor/master] doc: TCPProxy is not supported in TOR_PT_PROXY

2020-01-06 Thread nickm

commit 101bdeb02d78aab7d7b4b13e8620203ce6e44b4c
Author: Suphanat Chunhapanya 
Date:   Thu Aug 22 11:53:59 2019 +0800

doc: TCPProxy is not supported in TOR_PT_PROXY

Because we need to construct the URI using the TCPProxy configuration
but we don't have a standard URI scheme for haproxy yet, we decided to
not support TCPProxy in TOR_PT_PROXY now. There is no problem with
HTTPSProxy, Socks4Proxy, or Socks5Proxy because they all have standard
URI schemes.
---
 src/feature/client/transports.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c
index 97bfc8ae3..de383c983 100644
--- a/src/feature/client/transports.c
+++ b/src/feature/client/transports.c
@@ -733,6 +733,9 @@ get_pt_proxy_uri(void)
   const or_options_t *options = get_options();
   char *uri = NULL;
 
+  /* XXX: Currently TCPProxy is not supported in TOR_PT_PROXY because
+   * there isn't a standard URI scheme for some proxy protocols, such as
+   * haproxy. */
   if (options->Socks4Proxy || options->Socks5Proxy || options->HTTPSProxy) {
 char addr[TOR_ADDR_BUF_LEN+1];
 



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

[tor-commits] [tor/master] test: Implement haproxy

2020-01-06 Thread nickm

commit 41b9dca07bb7dea4758cf97f9bbff7a52b09ebf4
Author: Suphanat Chunhapanya 
Date:   Tue Sep 10 15:32:08 2019 +0800

test: Implement haproxy
---
 src/test/include.am   |  1 +
 src/test/test.c   |  1 +
 src/test/test.h   |  1 +
 src/test/test_proto_haproxy.c | 66 +++
 4 files changed, 69 insertions(+)

diff --git a/src/test/include.am b/src/test/include.am
index d8e25dea9..b7f3d7ece 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -182,6 +182,7 @@ src_test_test_SOURCES += \
src/test/test_process_descs.c \
src/test/test_prob_distr.c \
src/test/test_procmon.c \
+   src/test/test_proto_haproxy.c \
src/test/test_proto_http.c \
src/test/test_proto_misc.c \
src/test/test_protover.c \
diff --git a/src/test/test.c b/src/test/test.c
index 6dbec26fa..11a00606f 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -899,6 +899,7 @@ struct testgroup_t testgroups[] = {
   { "prob_distr/", prob_distr_tests },
   { "procmon/", procmon_tests },
   { "process/", process_tests },
+  { "proto/haproxy/", proto_haproxy_tests },
   { "proto/http/", proto_http_tests },
   { "proto/misc/", proto_misc_tests },
   { "protover/", protover_tests },
diff --git a/src/test/test.h b/src/test/test.h
index 76c4c0ec7..fdae38a10 100644
--- a/src/test/test.h
+++ b/src/test/test.h
@@ -254,6 +254,7 @@ extern struct testcase_t slow_stochastic_prob_distr_tests[];
 extern struct testcase_t procmon_tests[];
 extern struct testcase_t process_tests[];
 extern struct testcase_t process_descs_tests[];
+extern struct testcase_t proto_haproxy_tests[];
 extern struct testcase_t proto_http_tests[];
 extern struct testcase_t proto_misc_tests[];
 extern struct testcase_t protover_tests[];
diff --git a/src/test/test_proto_haproxy.c b/src/test/test_proto_haproxy.c
new file mode 100644
index 0..653bf67e2
--- /dev/null
+++ b/src/test/test_proto_haproxy.c
@@ -0,0 +1,66 @@
+/* Copyright (c) 2019, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+/**
+ * \file test_proto_haproxy.c
+ * \brief Tests for our HAProxy protocol parser code
+ */
+
+#define PROTO_HAPROXY_PRIVATE
+
+#include "test/test.h"
+#include "core/proto/proto_haproxy.h"
+#include "test/log_test_helpers.h"
+
+static void
+test_format_proxy_header_line(void *arg)
+{
+  tor_addr_t addr;
+  tor_addr_port_t *addr_port = NULL;
+  char *output = NULL;
+
+  (void) arg;
+
+  /* IPv4 address. */
+  tor_addr_parse(, "192.168.1.2");
+  addr_port = tor_addr_port_new(, 8000);
+  output = haproxy_format_proxy_header_line(addr_port);
+
+  tt_str_op(output, OP_EQ, "PROXY TCP4 0.0.0.0 192.168.1.2 0 8000\r\n");
+
+  tor_free(addr_port);
+  tor_free(output);
+
+  /* IPv6 address. */
+  tor_addr_parse(, "123:45:6789::5005:11");
+  addr_port = tor_addr_port_new(, 8000);
+  output = haproxy_format_proxy_header_line(addr_port);
+
+  tt_str_op(output, OP_EQ, "PROXY TCP6 :: 123:45:6789::5005:11 0 8000\r\n");
+
+  tor_free(addr_port);
+  tor_free(output);
+
+  /* UNIX socket address. */
+  memset(, 0, sizeof(addr));
+  addr.family = AF_UNIX;
+  addr_port = tor_addr_port_new(, 8000);
+  output = haproxy_format_proxy_header_line(addr_port);
+
+  /* If it's not an IPv4 or IPv6 address, haproxy_format_proxy_header_line
+   * must return NULL. */
+  tt_ptr_op(output, OP_EQ, NULL);
+
+  tor_free(addr_port);
+  tor_free(output);
+
+ done:
+  tor_free(addr_port);
+  tor_free(output);
+}
+
+struct testcase_t proto_haproxy_tests[] = {
+  { "format_proxy_header_line", test_format_proxy_header_line, 0, NULL, NULL },
+
+  END_OF_TESTCASES
+};



___
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 'haxxpop/tcp_proxy_squashed' into tcp_proxy_squshed_and_merged

2020-01-06 Thread nickm

commit 1b63eea66cbb8793a3cff05de8d856ce3b93fc17
Merge: 9276c07a9 14d781fff
Author: Nick Mathewson 
Date:   Mon Jan 6 13:41:20 2020 -0500

Merge branch 'haxxpop/tcp_proxy_squashed' into tcp_proxy_squshed_and_merged

 changes/ticket31518|   6 +
 doc/tor.1.txt  |  16 ++
 src/app/config/config.c|  89 +++-
 src/app/config/config.h|   2 +
 src/app/config/or_options_st.h |  11 +
 src/core/include.am|   2 +
 src/core/mainloop/connection.c | 341 ++---
 src/core/mainloop/connection.h |   4 +-
 src/core/or/connection_or.c|  26 ++-
 src/core/or/connection_or.h|   7 +
 src/core/or/or.h   |   5 +-
 src/core/or/or_connection_st.h |   2 +-
 src/core/proto/.may_include|   6 +-
 src/core/proto/proto_haproxy.c |  45 
 src/core/proto/proto_haproxy.h |  12 +
 src/feature/client/transports.c|   3 +
 src/feature/control/btrack_orconn_cevent.c |   1 +
 src/test/include.am|   1 +
 src/test/test.c|   1 +
 src/test/test.h|   1 +
 src/test/test_config.c |  47 
 src/test/test_connection.c |  96 +++-
 src/test/test_connection.h |   1 +
 src/test/test_helpers.c|  81 +++
 src/test/test_helpers.h|   3 +
 src/test/test_options.c|   9 +-
 src/test/test_proto_haproxy.c  |  66 ++
 27 files changed, 731 insertions(+), 153 deletions(-)

diff --cc doc/tor.1.txt
index 85369dfce,5bcb6ec2b..e1738c9ba
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@@ -880,63 -910,8 +880,79 @@@ forward slash (/) in the configuration 
  If KIST is used in Schedulers, this is a multiplier of the per-socket
  limit calculation of the KIST algorithm. (Default: 1.0)
  
 -CLIENT OPTIONS
 ---
 +
 +[[ServerTransportListenAddr]] **ServerTransportListenAddr** __transport__ 
__IP__:__PORT__::
 +When this option is set, Tor will suggest __IP__:__PORT__ as the
 +listening address of any pluggable transport proxy that tries to
 +launch __transport__. (IPv4 addresses should written as-is; IPv6
 +addresses should be wrapped in square brackets.) (Default: none)
 +
 +[[ServerTransportOptions]] **ServerTransportOptions** __transport__ __k=v__ 
__k=v__ ...::
 +When this option is set, Tor will pass the __k=v__ parameters to
 +any pluggable transport proxy that tries to launch __transport__. +
 +(Example: ServerTransportOptions obfs45 shared-secret=bridgepasswd 
cache=/var/lib/tor/cache) (Default: none)
 +
 +[[ServerTransportPlugin]] **ServerTransportPlugin** __transport__ exec 
__path-to-binary__ [options]::
 +The Tor relay launches the pluggable transport proxy in __path-to-binary__
 +using __options__ as its command-line options, and expects to receive
 +proxied client traffic from it. (Default: none)
 +
 +[[Socks4Proxy]] **Socks4Proxy** __host__[:__port__]::
 +Tor will make all OR connections through the SOCKS 4 proxy at host:port
 +(or host:1080 if port is not specified).
 +
 +[[Socks5Proxy]] **Socks5Proxy** __host__[:__port__]::
 +Tor will make all OR connections through the SOCKS 5 proxy at host:port
 +(or host:1080 if port is not specified).
 +
 +// Out of order because Username logically precedes Password
 +[[Socks5ProxyUsername]] **Socks5ProxyUsername** __username__ +
 +
 +[[Socks5ProxyPassword]] **Socks5ProxyPassword** __password__::
 +If defined, authenticate to the SOCKS 5 server using username and password
 +in accordance to RFC 1929. Both username and password must be between 1 
and
 +255 characters.
 +
 +[[SyslogIdentityTag]] **SyslogIdentityTag** __tag__::
 +When logging to syslog, adds a tag to the syslog identity such that
 +log entries are marked with "Tor-__tag__". Can not be changed while tor is
 +running. (Default: none)
 +
++[[TCPProxy]] **TCPProxy** __protocol__ __host__:__port__::
++  Tor will use the given protocol to make all its OR (SSL) connections 
through
++  a TCP proxy on host:port, rather than connecting directly to servers. 
You may
++  want to set **FascistFirewall** to restrict the set of ports you might 
try to
++  connect to, if your proxy only allows connecting to certain ports. 
There is no
++  equivalent option for directory connections, because all Tor client 
versions
++  that support this option download directory documents via OR 
connections. +
+++
++  The only protocol supported right now 'haproxy'. This option is only for
++  clients. (Default: none) +
+++
++  The HAProxy version 1 proxy protocol is described in detail at
++  https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt +

[tor-commits] [tor/master] test: HTTP CONNECT protocol

2020-01-06 Thread nickm

commit 4264717ca377464b5304df0e3a322afaef72d812
Author: Suphanat Chunhapanya 
Date:   Tue Oct 22 01:55:23 2019 +0800

test: HTTP CONNECT protocol
---
 src/test/test_connection.c | 37 -
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/test/test_connection.c b/src/test/test_connection.c
index 36543b3af..34ef3fdf1 100644
--- a/src/test/test_connection.c
+++ b/src/test/test_connection.c
@@ -316,13 +316,7 @@ test_conn_download_status_teardown(const struct testcase_t 
*tc, void *arg)
 static void *
 test_conn_proxy_connect_setup(const struct testcase_t *tc)
 {
-  tcp_proxy_protocol_t proxy_type = (tcp_proxy_protocol_t)tc->setup_data;
-  switch (proxy_type) {
-case TCP_PROXY_PROTOCOL_HAPROXY:
-  return test_conn_get_proxy_or_connection(PROXY_HAPROXY);
-default:
-  return NULL;
-  }
+  return test_conn_get_proxy_or_connection(*(unsigned int *)tc->setup_data);
 }
 
 static int
@@ -818,6 +812,25 @@ test_conn_download_status(void *arg)
   /* the teardown function removes all the connections in the global list*/;
 }
 
+static void
+test_conn_https_proxy_connect(void *arg)
+{
+  size_t sz;
+  char *buf = NULL;
+  or_connection_t *conn = arg;
+
+  MOCK(connection_or_change_state, mock_connection_or_change_state);
+
+  tt_int_op(conn->base_.proxy_state, OP_EQ, PROXY_HTTPS_WANT_CONNECT_OK);
+
+  buf = buf_get_contents(conn->base_.outbuf, );
+  tt_str_op(buf, OP_EQ, "CONNECT 127.0.0.1:12345 HTTP/1.0\r\n\r\n");
+
+ done:
+  UNMOCK(connection_or_change_state);
+  tor_free(buf);
+}
+
 static int handshake_start_called = 0;
 
 static int
@@ -957,6 +970,9 @@ test_failed_orconn_tracker(void *arg)
 #define CONNECTION_TESTCASE_ARG(name, fork, setup, arg)  \
   { #name "_" #arg, test_conn_##name, fork, , (void *)arg }
 
+static const unsigned int PROXY_CONNECT_ARG = PROXY_CONNECT;
+static const unsigned int PROXY_HAPROXY_ARG = PROXY_HAPROXY;
+
 struct testcase_t connection_tests[] = {
   CONNECTION_TESTCASE(get_basic, TT_FORK, test_conn_get_basic_st),
   CONNECTION_TESTCASE(get_rend,  TT_FORK, test_conn_get_rend_st),
@@ -966,9 +982,12 @@ struct testcase_t connection_tests[] = {
   test_conn_download_status_st, FLAV_MICRODESC),
   CONNECTION_TESTCASE_ARG(download_status,   TT_FORK,
   test_conn_download_status_st, FLAV_NS),
+
+  CONNECTION_TESTCASE_ARG(https_proxy_connect,   TT_FORK,
+  test_conn_proxy_connect_st, _CONNECT_ARG),
   CONNECTION_TESTCASE_ARG(haproxy_proxy_connect, TT_FORK,
-  test_conn_proxy_connect_st,
-  TCP_PROXY_PROTOCOL_HAPROXY),
+  test_conn_proxy_connect_st, _HAPROXY_ARG),
+
 //CONNECTION_TESTCASE(func_suffix, TT_FORK, setup_func_pair),
   { "failed_orconn_tracker", test_failed_orconn_tracker, TT_FORK, NULL, NULL },
   END_OF_TESTCASES



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

[tor-commits] [tor/master] circuit: Refactor connection_proxy_connect

2020-01-06 Thread nickm

commit 52e59640f9ae266d25a7727869c84e506c96a1c8
Author: Suphanat Chunhapanya 
Date:   Fri Aug 23 10:35:50 2019 +0800

circuit: Refactor connection_proxy_connect

Since connection_proxy_connect is too long now, it's better to create
new functions (connection_https_proxy_connect,
connection_socks4_proxy_connect, and connection_socks5_proxy_connect) to
make connection_proxy_connect shorter.
---
 src/core/mainloop/connection.c | 293 -
 1 file changed, 170 insertions(+), 123 deletions(-)

diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c
index 6094f33e4..c135bf395 100644
--- a/src/core/mainloop/connection.c
+++ b/src/core/mainloop/connection.c
@@ -2326,165 +2326,212 @@ conn_get_proxy_type(const connection_t *conn)
username NUL: */
 #define SOCKS4_STANDARD_BUFFER_SIZE (1 + 1 + 2 + 4 + 1)
 
-/** Write a proxy request of type (socks4, socks5, https) to conn
- * for conn->addr:conn->port, authenticating with the auth details given
- * in the configuration (if available). SOCKS 5 and HTTP CONNECT proxies
- * support authentication.
+/** Write a proxy request of https to conn for conn->addr:conn->port,
+ * authenticating with the auth details given in the configuration
+ * (if available).
  *
  * Returns -1 if conn->addr is incompatible with the proxy protocol, and
  * 0 otherwise.
- *
- * Use connection_read_proxy_handshake() to complete the handshake.
  */
-int
-connection_proxy_connect(connection_t *conn, int type)
+static int
+connection_https_proxy_connect(connection_t *conn)
 {
-  const or_options_t *options;
+  tor_assert(conn);
+
+  const or_options_t *options = get_options();
+  char buf[1024];
+  char *base64_authenticator = NULL;
+  const char *authenticator = options->HTTPSProxyAuthenticator;
+
+  /* Send HTTP CONNECT and authentication (if available) in
+   * one request */
+
+  if (authenticator) {
+base64_authenticator = alloc_http_authenticator(authenticator);
+if (!base64_authenticator)
+  log_warn(LD_OR, "Encoding https authenticator failed");
+  }
+
+  if (base64_authenticator) {
+const char *addrport = fmt_addrport(>addr, conn->port);
+tor_snprintf(buf, sizeof(buf), "CONNECT %s HTTP/1.1\r\n"
+"Host: %s\r\n"
+"Proxy-Authorization: Basic %s\r\n\r\n",
+addrport,
+addrport,
+base64_authenticator);
+tor_free(base64_authenticator);
+  } else {
+tor_snprintf(buf, sizeof(buf), "CONNECT %s HTTP/1.0\r\n\r\n",
+fmt_addrport(>addr, conn->port));
+  }
+
+  connection_buf_add(buf, strlen(buf), conn);
+  conn->proxy_state = PROXY_HTTPS_WANT_CONNECT_OK;
 
+  return 0;
+}
+
+/** Write a proxy request of socks4 to conn for conn->addr:conn->port.
+ *
+ * Returns -1 if conn->addr is incompatible with the proxy protocol, and
+ * 0 otherwise.
+ */
+static int
+connection_socks4_proxy_connect(connection_t *conn)
+{
   tor_assert(conn);
 
-  options = get_options();
+  unsigned char *buf;
+  uint16_t portn;
+  uint32_t ip4addr;
+  size_t buf_size = 0;
+  char *socks_args_string = NULL;
 
-  switch (type) {
-case PROXY_CONNECT: {
-  char buf[1024];
-  char *base64_authenticator=NULL;
-  const char *authenticator = options->HTTPSProxyAuthenticator;
-
-  /* Send HTTP CONNECT and authentication (if available) in
-   * one request */
-
-  if (authenticator) {
-base64_authenticator = alloc_http_authenticator(authenticator);
-if (!base64_authenticator)
-  log_warn(LD_OR, "Encoding https authenticator failed");
-  }
+  /* Send a SOCKS4 connect request */
 
-  if (base64_authenticator) {
-const char *addrport = fmt_addrport(>addr, conn->port);
-tor_snprintf(buf, sizeof(buf), "CONNECT %s HTTP/1.1\r\n"
- "Host: %s\r\n"
- "Proxy-Authorization: Basic %s\r\n\r\n",
- addrport,
- addrport,
- base64_authenticator);
-tor_free(base64_authenticator);
-  } else {
-tor_snprintf(buf, sizeof(buf), "CONNECT %s HTTP/1.0\r\n\r\n",
- fmt_addrport(>addr, conn->port));
-  }
+  if (tor_addr_family(>addr) != AF_INET) {
+log_warn(LD_NET, "SOCKS4 client is incompatible with IPv6");
+return -1;
+  }
 
-  connection_buf_add(buf, strlen(buf), conn);
-  conn->proxy_state = PROXY_HTTPS_WANT_CONNECT_OK;
-  break;
+  { /* If we are here because we are trying to connect to a
+   pluggable transport proxy, check if we have any SOCKS
+   arguments to transmit. If we do, compress all arguments to
+   a single string in 'socks_args_string': */
+
+if (conn_get_proxy_type(conn) == PROXY_PLUGGABLE) {
+  socks_args_string =
+pt_get_socks_args_for_proxy_addrport(>addr, conn->port);
+  if (socks_args_string)
+log_debug(LD_NET, "Sending out '%s' as our SOCKS argument string.",
+socks_args_string);
 }
+  }
 
-

[tor-commits] [tor/master] test: Add TCPProxy option for haproxy protocol

2020-01-06 Thread nickm

commit 9dd04396ba66602e89df52fd8bc1cbad1201083b
Author: Suphanat Chunhapanya 
Date:   Thu Aug 22 10:25:04 2019 +0800

test: Add TCPProxy option for haproxy protocol
---
 src/test/test_config.c | 47 +++
 1 file changed, 47 insertions(+)

diff --git a/src/test/test_config.c b/src/test/test_config.c
index cbb84e4dc..a9094c79b 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -672,6 +672,52 @@ transport_is_needed_mock(const char *transport_name)
   return transport_is_needed_mock_return;
 }
 
+static void
+test_config_parse_tcp_proxy_line(void *arg)
+{
+  (void)arg;
+
+  int ret;
+  char *msg = NULL;
+  or_options_t *options = get_options_mutable();
+
+  /* Bad TCPProxy line - too short. */
+  ret = parse_tcp_proxy_line("haproxy", options, );
+  /* Return error. */
+  tt_int_op(ret, OP_EQ, -1);
+  /* Correct error message. */
+  tt_str_op(msg, OP_EQ, "TCPProxy has no address/port. Please fix.");
+  /* Free error message. */
+  tor_free(msg);
+
+  /* Bad TCPProxy line - unsupported protocol. */
+  ret = parse_tcp_proxy_line("unsupported 95.216.163.36:443", options, );
+  tt_int_op(ret, OP_EQ, -1);
+  tt_str_op(msg, OP_EQ, "TCPProxy protocol is not supported. Currently the "
+"only supported protocol is 'haproxy'. Please fix.");
+  tor_free(msg);
+
+  /* Bad TCPProxy line - unparsable address/port. */
+  ret = parse_tcp_proxy_line("haproxy 95.216.163.36/443", options, );
+  tt_int_op(ret, OP_EQ, -1);
+  tt_str_op(msg, OP_EQ, "TCPProxy address/port failed to parse or resolve. "
+"Please fix.");
+  tor_free(msg);
+
+  /* Good TCPProxy line - ipv4. */
+  ret = parse_tcp_proxy_line("haproxy 95.216.163.36:443", options, );
+  tt_int_op(ret, OP_EQ, 0);
+  tt_ptr_op(msg, OP_EQ, NULL);
+  tt_int_op(options->TCPProxyProtocol, OP_EQ, TCP_PROXY_PROTOCOL_HAPROXY);
+  /* Correct the address. */
+  tt_assert(tor_addr_eq_ipv4h(>TCPProxyAddr, 0x5fd8a324));
+  tt_int_op(options->TCPProxyPort, OP_EQ, 443);
+  tor_free(msg);
+
+ done:
+  ;
+}
+
 /**
  * Test parsing for the ClientTransportPlugin and ServerTransportPlugin config
  * options.
@@ -6097,6 +6143,7 @@ struct testcase_t config_tests[] = {
   CONFIG_TEST(parse_bridge_line, 0),
   CONFIG_TEST(parse_transport_options_line, 0),
   CONFIG_TEST(parse_transport_plugin_line, TT_FORK),
+  CONFIG_TEST(parse_tcp_proxy_line, TT_FORK),
   CONFIG_TEST(check_or_create_data_subdir, TT_FORK),
   CONFIG_TEST(write_to_data_subdir, TT_FORK),
   CONFIG_TEST(fix_my_family, 0),



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

[tor-commits] [tor/master] config: Add TCPProxy option for haproxy protocol

2020-01-06 Thread nickm

commit 5a6a6ed33c400c93387f388e3b8fb109d7047f2f
Author: Suphanat Chunhapanya 
Date:   Wed Aug 21 14:56:32 2019 +0800

config: Add TCPProxy option for haproxy protocol

Read the TCPProxy option and put in or_options_t.
---
 src/app/config/config.c| 89 ++
 src/app/config/config.h|  2 +
 src/app/config/or_options_st.h | 11 ++
 src/test/test_options.c|  9 +++--
 4 files changed, 99 insertions(+), 12 deletions(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index deda2448b..c67f547cf 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -522,6 +522,7 @@ static const config_var_t option_vars_[] = {
   V(Socks5Proxy, STRING,   NULL),
   V(Socks5ProxyUsername, STRING,   NULL),
   V(Socks5ProxyPassword, STRING,   NULL),
+  V(TCPProxy,STRING,   NULL),
   VAR("KeyDirectory",FILENAME, KeyDirectory_option, NULL),
   V(KeyDirectoryGroupReadable,   BOOL, "0"),
   VAR_D("HSLayer2Nodes", ROUTERSET,  HSLayer2Nodes,  NULL),
@@ -4150,19 +4151,28 @@ options_validate(or_options_t *old_options, 
or_options_t *options,
 }
   }
 
+  if (options->TCPProxy) {
+int res = parse_tcp_proxy_line(options->TCPProxy, options, msg);
+if (res < 0) {
+  return res;
+}
+  }
+
   /* Check if more than one exclusive proxy type has been enabled. */
   if (!!options->Socks4Proxy + !!options->Socks5Proxy +
-  !!options->HTTPSProxy > 1)
+  !!options->HTTPSProxy + !!options->TCPProxy > 1)
 REJECT("You have configured more than one proxy type. "
-   "(Socks4Proxy|Socks5Proxy|HTTPSProxy)");
+   "(Socks4Proxy|Socks5Proxy|HTTPSProxy|TCPProxy)");
 
   /* Check if the proxies will give surprising behavior. */
   if (options->HTTPProxy && !(options->Socks4Proxy ||
   options->Socks5Proxy ||
-  options->HTTPSProxy)) {
-log_warn(LD_CONFIG, "HTTPProxy configured, but no SOCKS proxy or "
- "HTTPS proxy configured. Watch out: this configuration will "
- "proxy unencrypted directory connections only.");
+  options->HTTPSProxy ||
+  options->TCPProxy)) {
+log_warn(LD_CONFIG, "HTTPProxy configured, but no SOCKS proxy, "
+ "HTTPS proxy, or any other TCP proxy configured. Watch out: "
+ "this configuration will proxy unencrypted directory "
+ "connections only.");
   }
 
   if (options->Socks5ProxyUsername) {
@@ -5962,6 +5972,68 @@ parse_bridge_line(const char *line)
   return bridge_line;
 }
 
+/** Parse the contents of a TCPProxy line from line and put it
+ * in options. Return 0 if the line is well-formed, and -1 if it
+ * isn't.
+ *
+ * This will mutate only options->TCPProxyProtocol, options->TCPProxyAddr,
+ * and options->TCPProxyPort.
+ *
+ * On error, tor_strdup an error explanation into *msg.
+ */
+STATIC int
+parse_tcp_proxy_line(const char *line, or_options_t *options, char **msg)
+{
+  int ret = 0;
+  tor_assert(line);
+  tor_assert(options);
+  tor_assert(msg);
+
+  smartlist_t *sl = smartlist_new();
+  /* Split between the protocol and the address/port. */
+  smartlist_split_string(sl, line, " ",
+ SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 2);
+
+  /* The address/port is not specified. */
+  if (smartlist_len(sl) < 2) {
+*msg = tor_strdup("TCPProxy has no address/port. Please fix.");
+goto err;
+  }
+
+  char *protocol_string = smartlist_get(sl, 0);
+  char *addrport_string = smartlist_get(sl, 1);
+
+  /* The only currently supported protocol is 'haproxy'. */
+  if (strcasecmp(protocol_string, "haproxy")) {
+*msg = tor_strdup("TCPProxy protocol is not supported. Currently "
+  "the only supported protocol is 'haproxy'. "
+  "Please fix.");
+goto err;
+  } else {
+/* Otherwise, set the correct protocol. */
+options->TCPProxyProtocol = TCP_PROXY_PROTOCOL_HAPROXY;
+  }
+
+  /* Parse the address/port. */
+  if (tor_addr_port_lookup(addrport_string, >TCPProxyAddr,
+   >TCPProxyPort) < 0) {
+*msg = tor_strdup("TCPProxy address/port failed to parse or resolve. "
+  "Please fix.");
+goto err;
+  }
+
+  /* Success. */
+  ret = 0;
+  goto end;
+
+ err:
+  ret = -1;
+ end:
+  SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp));
+  smartlist_free(sl);
+  return ret;
+}
+
 /** Read the contents of a ClientTransportPlugin or ServerTransportPlugin
  * line from line, depending on the value of server. Return 0
  * if the line is well-formed, and -1 if it isn't.
@@ -6110,9 +6182,10 @@ parse_transport_line(const or_options_t *options,
 
 /* ClientTransportPlugins connecting through a proxy is managed only. */
 if (!server && (options->Socks4Proxy || options->Socks5Proxy ||
-options->HTTPSProxy)) {
+

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

2020-01-06 Thread translation

commit af9c85b9721323682031d8fc62935ac938f55101
Author: Translation commit bot 
Date:   Mon Jan 6 21:25:33 2020 +

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

diff --git a/contents+ru.po b/contents+ru.po
index fedde7503b..3c1dd0bff5 100644
--- a/contents+ru.po
+++ b/contents+ru.po
@@ -3584,7 +3584,7 @@ msgstr ""
 #: https//support.torproject.org/tormobile/tormobile-7/
 #: (content/tormobile/tormobile-7/contents+en.lrquestion.title)
 msgid "Is Tor Browser available on F-Droid?"
-msgstr ""
+msgstr "ÐÐ¾Ð¶Ð½Ð¾ Ð»Ð¸ ÑÐºÐ°ÑÐ°ÑÑ Tor Browser Ñ ÑÐµÑÑÑÑÐ° F-Droid?"
 
 #: https//support.torproject.org/tormobile/tormobile-7/
 #: (content/tormobile/tormobile-7/contents+en.lrquestion.description)
@@ -4266,19 +4266,19 @@ msgstr ""
 #: https//support.torproject.org/https/https-2/
 #: (content/https/https-2/contents+en.lrquestion.title)
 msgid "Can I browse normal HTTPS sites with Tor?"
-msgstr ""
+msgstr "ÐÐ¾Ð¶Ð½Ð¾ Ð»Ð¸ Ð¾ÑÐºÑÑÐ²Ð°ÑÑ Ð¾Ð±ÑÑÐ½ÑÐµ HTTPS-ÑÐ°Ð¹ÑÑ 
ÑÐµÑÐµÐ· Tor?"
 
 #: https//support.torproject.org/https/https-2/
 #: (content/https/https-2/contents+en.lrquestion.description)
 msgid ""
 "The short answer is: **Yes, you can browse normal HTTPS Sites using Tor.**"
-msgstr ""
+msgstr "ÐÑÐ»Ð¸ ÐºÐ¾ÑÐ¾ÑÐºÐ¾: **Ð´Ð°, ÑÐµÑÐµÐ· Tor Ð¼Ð¾Ð¶Ð½Ð¾ 
Ð¾ÑÐºÑÑÐ²Ð°ÑÑ Ð¾Ð±ÑÑÐ½ÑÐµ HTTPS-ÑÐ°Ð¹ÑÑ.**"
 
 #: https//support.torproject.org/https/https-2/
 #: (content/https/https-2/contents+en.lrquestion.description)
 msgid ""
 "HTTPS Connections are used to secure communications over computer networks."
-msgstr ""
+msgstr "HTTPS Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ Ð´Ð»Ñ Ð·Ð°ÑÐ¸ÑÑ 
ÐºÐ¾Ð¼Ð¼ÑÐ½Ð¸ÐºÐ°ÑÐ¸Ð¹ Ð² ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ½ÑÑ ÑÐµÑÑÑ."
 
 #: https//support.torproject.org/https/https-2/
 #: (content/https/https-2/contents+en.lrquestion.description)
@@ -4286,6 +4286,8 @@ msgid ""
 "You can [read more about HTTPS here](https://tb-manual.torproject.org;
 "/secure-connections/)."
 msgstr ""
+"ÐÐ¾Ð´ÑÐ¾Ð±Ð½ÐµÐµ Ð¾ HTTPS Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÑÐ¾ÑÐµÑÑÑ 
[Ð·Ð´ÐµÑÑ](https://tb-manual.torproject.org;
+"/secure-connections/)."
 
 #: https//support.torproject.org/https/https-2/
 #: (content/https/https-2/contents+en.lrquestion.description)
@@ -4294,6 +4296,9 @@ msgid ""
 " plugin which automatically switches thousands of sites from unencrypted "
 "\"HTTP\" to more private \"HTTPS\"."
 msgstr ""
+"Ð Tor Browser ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ Ð´Ð¾Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ [HTTPS 
Everywhere](https://www.eff.org;
+"/https-everywhere). ÐÐ½Ð¾ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸ Ð¿ÐµÑÐµÐºÐ»ÑÑÐ°ÐµÑ 
ÑÐ°Ð¹Ñ Ñ Ð½ÐµÐ·Ð°ÑÐ¸ÑÑÐ¾Ð²Ð°Ð½Ð½Ð¾Ð¹ "
+"Ð²ÐµÑÑÐ¸Ð¸ \"HTTP\" Ð½Ð° Ð±Ð¾Ð»ÐµÐµ Ð·Ð°ÑÐ¸ÑÐµÐ½Ð½ÑÑ \"HTTPS\"."
 
 #: https//support.torproject.org/operators/bandwidth-shaping/
 #: (content/operators/bandwidth-shaping/contents+en.lrquestion.title)
@@ -4456,18 +4461,18 @@ msgstr ""
 #: https//support.torproject.org/operators/better-anonymity/
 #: (content/operators/better-anonymity/contents+en.lrquestion.title)
 msgid "Do I get better anonymity if I run a relay?"
-msgstr ""
+msgstr "ÐÑÐ»Ð¸ Ñ Ð±ÑÐ´Ñ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÑÑ ÑÐ»ÑÐ·, ÑÑÐ¾ 
Ð´Ð°ÑÑ Ð¼Ð½Ðµ Ð±Ð¾Ð»ÑÑÐµ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾ÑÑÐ¸?"
 
 #: https//support.torproject.org/operators/better-anonymity/
 #: (content/operators/better-anonymity/contents+en.lrquestion.description)
 msgid "Yes, you do get better anonymity against some attacks."
-msgstr ""
+msgstr "ÐÐ°, Ñ Ð²Ð°Ñ Ð±ÑÐ´ÐµÑ Ð±Ð¾Ð»ÑÑÐµ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾ÑÑÐ¸ Ð² 
Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð½ÑÑ ÑÐ¸ÑÑÐ°ÑÐ¸ÑÑ ÑÐ¸ÑÐºÐ°."
 
 #: https//support.torproject.org/operators/better-anonymity/
 #: (content/operators/better-anonymity/contents+en.lrquestion.description)
 msgid ""
 "The simplest example is an attacker who owns a small number of Tor relays."
-msgstr ""
+msgstr "ÐÑÐ¾ÑÑÐ¾Ð¹ Ð¿ÑÐ¸Ð¼ÐµÑ: Ñ ÑÐ°Ð¼Ð¾Ð³Ð¾ 
Ð·Ð»Ð¾ÑÐ¼ÑÑÐ»ÐµÐ½Ð½Ð¸ÐºÐ° ÐµÑÑÑ Ð½ÐµÑÐºÐ¾Ð»ÑÐºÐ¾ Tor-ÑÐ»ÑÐ·Ð¾Ð²."
 
 #: https//support.torproject.org/operators/better-anonymity/
 #: (content/operators/better-anonymity/contents+en.lrquestion.description)
@@ -4476,6 +4481,8 @@ msgid ""
 "the connection originated at your computer or was relayed from somebody "
 "else."
 msgstr ""
+"ÐÐ»Ð¾ÑÐ¼ÑÑÐ»ÐµÐ½Ð½Ð¸Ðº ÑÐ²Ð¸Ð´Ð¸Ñ, ÑÑÐ¾ ÑÑÐ°ÑÐ¸Ðº Ð¸ÑÑÐ¾Ð´Ð¸Ñ 
Ð¾Ñ Ð²Ð°Ñ, Ð½Ð¾ Ð½Ðµ ÑÐ¼Ð¾Ð¶ÐµÑ ÑÐ·Ð½Ð°ÑÑ, "
+"Ð¿Ð¾ÑÐ²Ð¸Ð»ÑÑ Ð»Ð¸ ÑÑÐ¾Ñ ÑÑÐ°ÑÐ¸Ðº Ð½Ð° Ð²Ð°ÑÐµÐ¼ 
ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐµ Ð¸Ð»Ð¸ Ð²Ñ Ð¿ÑÐ¾ÑÑÐ¾ Ð¿Ð¾ÑÑÐµÐ´Ð½Ð¸Ðº."
 
 #: https//support.torproject.org/operators/better-anonymity/
 #: (content/operators/better-anonymity/contents+en.lrquestion.description)
@@ -4484,6 +4491,10 @@ msgid ""
 " all of your incoming and outgoing traffic, then it's easy for them to learn"
 " which connections were relayed and which started at you."
 msgstr ""
+"Ð Ð½ÐµÐºÐ¾ÑÐ¾ÑÑÑ ÑÐ»ÑÑÐ°ÑÑ ÑÑÐ¾ Ð½Ðµ ÑÐ°Ð±Ð¾ÑÐ°ÐµÑ. 
ÐÐ°Ð¿ÑÐ¸Ð¼ÐµÑ, ÐµÑÐ»Ð¸ Ð·Ð»Ð¾ÑÐ¼ÑÑÐ»ÐµÐ½Ð½Ð¸Ðº Ð¸Ð¼ÐµÐµÑ "
+"Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ

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

2020-01-06 Thread translation

commit 5f15e9b2a2f82975c8e291d05563e60f2b9a0ee2
Author: Translation commit bot 
Date:   Mon Jan 6 20:45:38 2020 +


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

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index aec284727b..cad3316880 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -3223,7 +3223,7 @@ msgid ""
 "of-- maybe you will :)"
 msgstr ""
 "Il existe probablement dâautres faÃ§ons de faire un don anonyme auxquelles "
-"nous nâavons pas pensÃ©. Peut-Ãªtre le ferez-vousâ?:)"
+"nous nâavons pas pensÃ©. Peut-Ãªtre en trouverez-vousâ? :)"
 
 #: 
tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:391
 msgid ""

___
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

2020-01-06 Thread translation

commit 8e30e9467331c0edbde04f08cc2d96a2e42abad5
Author: Translation commit bot 
Date:   Mon Jan 6 20:21:19 2020 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 50f632478c..fe0c014990 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -3,8 +3,7 @@
 # Curtis Baltimore , 2019
 # Nicolas Perraut , 2019
 # erinm, 2019
-# AO , 2019
-# Mattias Uroz , 2019
+# AO , 2020
 # 
 msgid ""
 msgstr ""
@@ -12,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-11-29 10:58+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Mattias Uroz , 2019\n"
+"Last-Translator: AO , 2020\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"
@@ -406,7 +405,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.description)
 msgid "Installing Tor Browser"
-msgstr "Installation du Navigateur Tor"
+msgstr "Installation du NavigateurÂ Tor"
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)

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

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

2020-01-06 Thread translation

commit e5d0fb2d96fc6821728ecb4a4a583ce1d67a3f19
Author: Translation commit bot 
Date:   Mon Jan 6 20:19:26 2020 +

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

diff --git a/es.po b/es.po
index 53437bc4c7..e7a0fafb98 100644
--- a/es.po
+++ b/es.po
@@ -7,7 +7,7 @@
 # Edward Navarro, 2015
 # el buve, 2015
 # Emma Peel, 2015,2017-2019
-# eulalio barbero espinosa , 2018-2019
+# eulalio barbero espinosa , 2018-2020
 # JoaquÃn Serna , 2019
 # Jose Luis Tirado , 2014-2015
 # Manuel Herrera , 2013
@@ -19,8 +19,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-01-06 11:20+0100\n"
-"PO-Revision-Date: 2020-01-06 13:47+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2020-01-06 20:04+\n"
+"Last-Translator: eulalio barbero espinosa \n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

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

2020-01-06 Thread translation

commit 1aa6ed528587d188d75123b2ea29869bc427ad09
Author: Translation commit bot 
Date:   Mon Jan 6 20:17:30 2020 +

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

diff --git a/es.po b/es.po
index 79daf23853..a54507bdf3 100644
--- a/es.po
+++ b/es.po
@@ -7,7 +7,7 @@
 # Edward Navarro, 2015
 # el buve, 2015
 # Emma Peel, 2015,2017-2019
-# eulalio barbero espinosa , 2018-2019
+# eulalio barbero espinosa , 2018-2020
 # JoaquÃn Serna , 2019
 # Jose Luis Tirado , 2014-2015
 # Manuel Herrera , 2013
@@ -19,8 +19,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-01-06 11:20+0100\n"
-"PO-Revision-Date: 2020-01-06 13:47+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2020-01-06 20:04+\n"
+"Last-Translator: eulalio barbero espinosa \n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -121,11 +121,11 @@ msgid ""
 "website.\\n\\nCheck your network connection, and restart Tails to try "
 "upgrading again.\\n\\nIf the problem persists, go to "
 "file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
-msgstr ""
+msgstr "Se produjo un error al actualizar la clave de 
firma.\\n\\nEsto impide determinar si una actualizaciÃ³n estÃ¡ 
disponible en nuestro sitio web.\\n\\nComprueba tu conexiÃ³n de red, y 
reinicia Tails para intentar actualizar de nuevo.\\n\\nISÃ se mantiene el 
problema, mira en 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:250
 msgid "Error while updating the signing key"
-msgstr ""
+msgstr "Error al actualizar la clave de firma"
 
 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:279
 msgid "Error while checking for upgrades"

___
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

2020-01-06 Thread translation

commit 3c80c5ff772f49da10c64a47d11210099ab54185
Author: Translation commit bot 
Date:   Mon Jan 6 20:15:36 2020 +


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

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 6748af048b..aec284727b 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -1,12 +1,12 @@
 # Translators:
 # N W, 2018
-# AO , 2019
 # erinm, 2019
 # Curtis Baltimore , 2019
+# AO , 2020
 # 
 msgid ""
 msgstr ""
-"Last-Translator: Curtis Baltimore , 2019\n"
+"Last-Translator: AO , 2020\n"
 "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -1066,9 +1066,9 @@ msgid ""
 "applications."
 msgstr ""
 "Avec votre soutien, nous pourrons nous attaquer Ã  dâambitieux projets, 
tels "
-"que le dÃ©veloppement dâun navigateur pour appareils mobiles plus 
sÃ©curisÃ© et"
-" qui amÃ©liore la confidentialitÃ©. Nous pourrons aussi faciliter "
-"lâintÃ©gration de Tor aux applications de dÃ©veloppeurs tiers."
+"que le dÃ©veloppement dâun navigateur plus sÃ©curisÃ© pour appareils 
mobiles "
+"qui amÃ©liore la confidentialitÃ©. Nous pourrons aussi faciliter 
lâintÃ©gration"
+" de Tor aux applications de dÃ©veloppeurs tiers."
 
 #: 
tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:71
 #: 
tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:76

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

[tor-commits] [tor/master] Add documentation about building a TAGS file.

2020-01-06 Thread nickm

commit e08d07692fa7f2dd0cd139cb0c7e359be4264d8a
Author: Nick Mathewson 
Date:   Mon Jan 6 13:31:30 2020 -0500

Add documentation about building a TAGS file.

Patch from opara.  Closes ticket 32779.
---
 changes/ticket32779 |  3 +++
 doc/HACKING/HelpfulTools.md | 24 
 2 files changed, 27 insertions(+)

diff --git a/changes/ticket32779 b/changes/ticket32779
new file mode 100644
index 0..1b7ccaa7e
--- /dev/null
+++ b/changes/ticket32779
@@ -0,0 +1,3 @@
+  o Documentation:
+- Add documentation in 'HelpfulTools.md' to describe how to build a tag
+  file. Closes ticket 32779.
diff --git a/doc/HACKING/HelpfulTools.md b/doc/HACKING/HelpfulTools.md
index cba57e875..866b32128 100644
--- a/doc/HACKING/HelpfulTools.md
+++ b/doc/HACKING/HelpfulTools.md
@@ -315,6 +315,30 @@ If you use emacs for editing Tor and nothing else, you 
could always just say:
 There is probably a better way to do this.  No, we are probably not going
 to clutter the files with emacs stuff.
 
+Building a tag file (code index)
+
+
+Many functions in tor use `MOCK_IMPL` wrappers for unit tests. Your
+tag-building program must be told how to handle this syntax.
+
+If you're using emacs, you can generate an emacs-compatible tag file using
+`make tags`. This will run your system's `etags`. Tor's build system assumes
+that you're using the emacs-specific version of `etags` (bundled under the
+`xemacs21-bin` package on Debian). This is incompatible with other versions of
+`etags` such as the version provided by Exuberant Ctags.
+
+If you're using vim or emacs, you can also use Universal Ctags to build a tag
+file using the syntax:
+
+ctags -R -D 'MOCK_IMPL(r,h,a)=r h a' .
+
+If you're using an older version of Universal Ctags, you can use the following
+instead:
+
+ctags -R 
--mline-regex-c='/MOCK_IMPL\([^,]+,\W*([a-zA-Z0-9_]+)\W*,/\1/f/{mgroup=1}' .
+
+A vim-compatible tag file will be generated by default. If you use emacs, add
+the `-e` flag to generate an emacs-compatible tag file.
 
 Doxygen
 ---



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

[tor-commits] [tor/master] Add NSF support acknowledgment to circpad dev doc.

2020-01-06 Thread nickm

commit b7dbb4a554e7f41d88371103065b55517d58b5d0
Author: Mike Perry 
Date:   Tue Dec 17 14:02:23 2019 -0600

Add NSF support acknowledgment to circpad dev doc.
---
 doc/HACKING/CircuitPaddingDevelopment.md | 4 
 1 file changed, 4 insertions(+)

diff --git a/doc/HACKING/CircuitPaddingDevelopment.md 
b/doc/HACKING/CircuitPaddingDevelopment.md
index a0dee68e9..a4e65697b 100644
--- a/doc/HACKING/CircuitPaddingDevelopment.md
+++ b/doc/HACKING/CircuitPaddingDevelopment.md
@@ -1228,3 +1228,7 @@ open-world case, to be more akin to an optimization 
problem, where a
 WTF-PAD-like defense must be tuned through an optimizer to produce results
 comparable to provably optimal but practically unrealizable defenses, through
 rigorous adversarial evaluation.
+
+## A. Acknowledgments
+
+This research was supported in part by NSF grants CNS-1619454 and CNS-1526306.



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

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1615'

2020-01-06 Thread nickm

commit 9276c07a916e4dc3b159c95c578e43be102f26e6
Merge: e08d07692 b7dbb4a55
Author: Nick Mathewson 
Date:   Mon Jan 6 13:32:33 2020 -0500

Merge remote-tracking branch 'tor-github/pr/1615'

 doc/HACKING/CircuitPaddingDevelopment.md | 4 
 1 file changed, 4 insertions(+)

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

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1620'

2020-01-06 Thread nickm

commit 1f498220bda87e44d8a3ab12825270fde6eec7dc
Merge: 48f734178 42e31b5c4
Author: Nick Mathewson 
Date:   Mon Jan 6 13:28:10 2020 -0500

Merge remote-tracking branch 'tor-github/pr/1620'

 changes/ticket32807| 4 
 doc/tor.1.txt  | 6 --
 src/app/config/config.c| 9 +
 src/app/config/or_options_st.h | 5 -
 src/app/config/testnet.inc | 1 -
 src/test/test_options.c| 7 ---
 6 files changed, 5 insertions(+), 27 deletions(-)

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

[tor-commits] [tor/master] Mark TestingEstimatedDescriptorPropagationTime as obsolete.

2020-01-06 Thread nickm

commit 42e31b5c45b5387d1c81067386373636bb8fd5c2
Author: Nick Mathewson 
Date:   Thu Dec 19 11:04:48 2019 -0500

Mark TestingEstimatedDescriptorPropagationTime as obsolete.

We stopped looking at this option in 85cf6dcba3693b, back when we
implemented the minimal pieces of prop275.  Since then, we've had
code to validate and adjust this option, and to give it a different
value in testing networks, but the option hasn't actually done
anything.

We can safely mark it as OBSOLETE, since doing so does not make any
old configuration get rejected.

Closes ticket 32807.
---
 changes/ticket32807| 4 
 doc/tor.1.txt  | 6 --
 src/app/config/config.c| 9 +
 src/app/config/or_options_st.h | 5 -
 src/app/config/testnet.inc | 1 -
 src/test/test_options.c| 7 ---
 6 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/changes/ticket32807 b/changes/ticket32807
new file mode 100644
index 0..07f8716e1
--- /dev/null
+++ b/changes/ticket32807
@@ -0,0 +1,4 @@
+  o Removed features:
+- The option "TestingEstimatedDescriptorPropagationTime" is now marked as
+  obsolete.  It has had no effect since 0.3.0.7, when clients stopped
+  rejecting consensuses "from the future".  Closes ticket 32807.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index aad37204c..85369dfce 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -3256,7 +3256,6 @@ The following options are used for running a testing Tor 
network.
TestingV3AuthInitialVoteDelay 20 seconds
TestingV3AuthInitialDistDelay 20 seconds
TestingAuthDirTimeToLearnReachability 0 minutes
-   TestingEstimatedDescriptorPropagationTime 0 minutes
TestingServerDownloadInitialDelay 0
TestingClientDownloadInitialDelay 0
TestingServerConsensusDownloadInitialDelay 0
@@ -3292,11 +3291,6 @@ The following options are used for running a testing Tor 
network.
 are Running until this much time has passed. Changing this requires
 that **TestingTorNetwork** is set.  (Default: 30 minutes)
 
-[[TestingEstimatedDescriptorPropagationTime]] 
**TestingEstimatedDescriptorPropagationTime** __N__ **minutes**|**hours**::
-Clients try downloading server descriptors from directory caches after this
-time. Changing this requires that **TestingTorNetwork** is set. (Default:
-10 minutes)
-
 [[TestingMinFastFlagThreshold]] **TestingMinFastFlagThreshold** __N__ 
**bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
 Minimum value for the Fast flag.  Overrides the ordinary minimum taken
 from the consensus when TestingTorNetwork is set. (Default: 0.)
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 680a7eeef..72ab065fb 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -451,7 +451,7 @@ static const config_var_t option_vars_[] = {
   V(EnforceDistinctSubnets,  BOOL, "1"),
   V_D(EntryNodes,ROUTERSET,   NULL),
   V(EntryStatistics, BOOL, "0"),
-  V(TestingEstimatedDescriptorPropagationTime, INTERVAL, "10 minutes"),
+  OBSOLETE("TestingEstimatedDescriptorPropagationTime"),
   V_D(ExcludeNodes,  ROUTERSET, NULL),
   V_D(ExcludeExitNodes,  ROUTERSET, NULL),
   OBSOLETE("ExcludeSingleHopRelays"),
@@ -4123,7 +4123,6 @@ options_validate_cb(const void *old_options_, void 
*options_, char **msg)
 CHECK_DEFAULT(TestingV3AuthInitialDistDelay);
 CHECK_DEFAULT(TestingV3AuthVotingStartOffset);
 CHECK_DEFAULT(TestingAuthDirTimeToLearnReachability);
-CHECK_DEFAULT(TestingEstimatedDescriptorPropagationTime);
 CHECK_DEFAULT(TestingServerDownloadInitialDelay);
 CHECK_DEFAULT(TestingClientDownloadInitialDelay);
 CHECK_DEFAULT(TestingServerConsensusDownloadInitialDelay);
@@ -4151,12 +4150,6 @@ options_validate_cb(const void *old_options_, void 
*options_, char **msg)
   if (options_validate_dirauth_testing(old_options, options, msg) < 0)
 return -1;
 
-  if (options->TestingEstimatedDescriptorPropagationTime < 0) {
-REJECT("TestingEstimatedDescriptorPropagationTime must be non-negative.");
-  } else if (options->TestingEstimatedDescriptorPropagationTime > 60*60) {
-COMPLAIN("TestingEstimatedDescriptorPropagationTime is insanely high.");
-  }
-
   if (options->TestingClientMaxIntervalWithoutRequest < 1) {
 REJECT("TestingClientMaxIntervalWithoutRequest is way too low.");
   } else if (options->TestingClientMaxIntervalWithoutRequest > 3600) {
diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h
index e63ae2510..4915be187 100644
--- a/src/app/config/or_options_st.h
+++ b/src/app/config/or_options_st.h
@@ -723,11 +723,6 @@ struct or_options_t {
* altered on testing networks. */
   int TestingAuthDirTimeToLearnReachability;
 
-  /** Clients don't download any descriptor this recent, since it will
-   * probably not have

[tor-commits] [tor/master] Fix formatting in tor_assertf() message in struct_check_magic().

2020-01-06 Thread nickm

commit b4977d1aa9366cdb1475664bcf1486fbfdf5a166
Author: Nick Mathewson 
Date:   Mon Dec 16 15:31:23 2019 -0500

Fix formatting in tor_assertf() message in struct_check_magic().

Closes 32771; bugfix on 0.4.2.1-alpha.
---
 changes/bug32771| 4 
 src/lib/confmgt/structvar.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/changes/bug32771 b/changes/bug32771
new file mode 100644
index 0..606bcf4be
--- /dev/null
+++ b/changes/bug32771
@@ -0,0 +1,4 @@
+  o Minor bugfixes (logging, crash):
+- Avoid a possible crash when trying to log a (fatal) assertion failure
+  about mismatched magic numbers in configuration objects. Fixes bug 32771;
+  bugfix on 0.4.2.1-alpha.
diff --git a/src/lib/confmgt/structvar.c b/src/lib/confmgt/structvar.c
index de678d18c..7a3b8c7df 100644
--- a/src/lib/confmgt/structvar.c
+++ b/src/lib/confmgt/structvar.c
@@ -53,8 +53,8 @@ struct_check_magic(const void *object, const 
struct_magic_decl_t *decl)
   const uint32_t *ptr = STRUCT_VAR_P(object, decl->magic_offset);
   tor_assertf(*ptr == decl->magic_val,
   "Bad magic number on purported %s object. "
-  "Expected %"PRIu32"x but got "PRIu32"x.",
-  decl->magic_val, *ptr);
+  "Expected %"PRIu32"x but got %"PRIu32"x.",
+  decl->typename, decl->magic_val, *ptr);
 }
 
 /**



___
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.2] Merge branch 'bug32765_041' into bug32771_042

2020-01-06 Thread nickm

commit df5c81fec0f25a684f1f7e68e80abcde5402d3ef
Merge: bd11fb109 1b619a627
Author: Nick Mathewson 
Date:   Mon Dec 16 15:27:18 2019 -0500

Merge branch 'bug32765_041' into bug32771_042

 changes/ticket32765| 4 
 src/lib/log/util_bug.h | 6 --
 2 files changed, 8 insertions(+), 2 deletions(-)




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

[tor-commits] [tor/release-0.4.2] Use CHECK_PRINTF() for printf-like functions in util_bug.h

2020-01-06 Thread nickm

commit 1b619a627ca1ee11d1680dc56e90e9fc1af2ddb5
Author: Nick Mathewson 
Date:   Mon Dec 16 15:14:13 2019 -0500

Use CHECK_PRINTF() for printf-like functions in util_bug.h
---
 changes/ticket32765| 4 
 src/lib/log/util_bug.h | 6 --
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/changes/ticket32765 b/changes/ticket32765
new file mode 100644
index 0..a9663a5df
--- /dev/null
+++ b/changes/ticket32765
@@ -0,0 +1,4 @@
+  o Minor bugfixes (correctness checks):
+- Use GCC/Clang's printf-checking feature to make sure that
+  tor_assertf() arguments are correctly typed. Fixes bug 32765;
+  bugfix on 0.4.1.1-alpha.
diff --git a/src/lib/log/util_bug.h b/src/lib/log/util_bug.h
index 546ae1e3e..993a4e3ab 100644
--- a/src/lib/log/util_bug.h
+++ b/src/lib/log/util_bug.h
@@ -242,10 +242,12 @@
 
 void tor_assertion_failed_(const char *fname, unsigned int line,
const char *func, const char *expr,
-   const char *fmt, ...);
+   const char *fmt, ...)
+CHECK_PRINTF(5,6);
 void tor_bug_occurred_(const char *fname, unsigned int line,
const char *func, const char *expr,
-   int once, const char *fmt, ...);
+   int once, const char *fmt, ...)
+  CHECK_PRINTF(6,7);
 
 void tor_abort_(void) ATTR_NORETURN;
 



___
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.2] Merge remote-tracking branch 'tor-github/pr/1612' into maint-0.4.2

2020-01-06 Thread nickm

commit 6da989cfe8323418ee1f888287d0d65b21b60c1d
Merge: 2d8d6d1eb b4977d1aa
Author: Nick Mathewson 
Date:   Mon Jan 6 13:20:57 2020 -0500

Merge remote-tracking branch 'tor-github/pr/1612' into maint-0.4.2

 changes/bug32771| 4 
 changes/ticket32765 | 4 
 src/lib/confmgt/structvar.c | 4 ++--
 src/lib/log/util_bug.h  | 6 --
 4 files changed, 14 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] Merge branch 'bug32765_041' into bug32771_042

2020-01-06 Thread nickm

commit df5c81fec0f25a684f1f7e68e80abcde5402d3ef
Merge: bd11fb109 1b619a627
Author: Nick Mathewson 
Date:   Mon Dec 16 15:27:18 2019 -0500

Merge branch 'bug32765_041' into bug32771_042

 changes/ticket32765| 4 
 src/lib/log/util_bug.h | 6 --
 2 files changed, 8 insertions(+), 2 deletions(-)




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

[tor-commits] [tor/maint-0.4.2] Fix formatting in tor_assertf() message in struct_check_magic().

2020-01-06 Thread nickm

commit b4977d1aa9366cdb1475664bcf1486fbfdf5a166
Author: Nick Mathewson 
Date:   Mon Dec 16 15:31:23 2019 -0500

Fix formatting in tor_assertf() message in struct_check_magic().

Closes 32771; bugfix on 0.4.2.1-alpha.
---
 changes/bug32771| 4 
 src/lib/confmgt/structvar.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/changes/bug32771 b/changes/bug32771
new file mode 100644
index 0..606bcf4be
--- /dev/null
+++ b/changes/bug32771
@@ -0,0 +1,4 @@
+  o Minor bugfixes (logging, crash):
+- Avoid a possible crash when trying to log a (fatal) assertion failure
+  about mismatched magic numbers in configuration objects. Fixes bug 32771;
+  bugfix on 0.4.2.1-alpha.
diff --git a/src/lib/confmgt/structvar.c b/src/lib/confmgt/structvar.c
index de678d18c..7a3b8c7df 100644
--- a/src/lib/confmgt/structvar.c
+++ b/src/lib/confmgt/structvar.c
@@ -53,8 +53,8 @@ struct_check_magic(const void *object, const 
struct_magic_decl_t *decl)
   const uint32_t *ptr = STRUCT_VAR_P(object, decl->magic_offset);
   tor_assertf(*ptr == decl->magic_val,
   "Bad magic number on purported %s object. "
-  "Expected %"PRIu32"x but got "PRIu32"x.",
-  decl->magic_val, *ptr);
+  "Expected %"PRIu32"x but got %"PRIu32"x.",
+  decl->typename, decl->magic_val, *ptr);
 }
 
 /**



___
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.2] Fix formatting in tor_assertf() message in struct_check_magic().

2020-01-06 Thread nickm

commit b4977d1aa9366cdb1475664bcf1486fbfdf5a166
Author: Nick Mathewson 
Date:   Mon Dec 16 15:31:23 2019 -0500

Fix formatting in tor_assertf() message in struct_check_magic().

Closes 32771; bugfix on 0.4.2.1-alpha.
---
 changes/bug32771| 4 
 src/lib/confmgt/structvar.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/changes/bug32771 b/changes/bug32771
new file mode 100644
index 0..606bcf4be
--- /dev/null
+++ b/changes/bug32771
@@ -0,0 +1,4 @@
+  o Minor bugfixes (logging, crash):
+- Avoid a possible crash when trying to log a (fatal) assertion failure
+  about mismatched magic numbers in configuration objects. Fixes bug 32771;
+  bugfix on 0.4.2.1-alpha.
diff --git a/src/lib/confmgt/structvar.c b/src/lib/confmgt/structvar.c
index de678d18c..7a3b8c7df 100644
--- a/src/lib/confmgt/structvar.c
+++ b/src/lib/confmgt/structvar.c
@@ -53,8 +53,8 @@ struct_check_magic(const void *object, const 
struct_magic_decl_t *decl)
   const uint32_t *ptr = STRUCT_VAR_P(object, decl->magic_offset);
   tor_assertf(*ptr == decl->magic_val,
   "Bad magic number on purported %s object. "
-  "Expected %"PRIu32"x but got "PRIu32"x.",
-  decl->magic_val, *ptr);
+  "Expected %"PRIu32"x but got %"PRIu32"x.",
+  decl->typename, decl->magic_val, *ptr);
 }
 
 /**



___
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.2] Merge branch 'maint-0.4.2' into release-0.4.2

2020-01-06 Thread nickm

commit f1173a63fb905922a2ef13588a1999d85a24a9f6
Merge: 77188ef36 6da989cfe
Author: Nick Mathewson 
Date:   Mon Jan 6 13:24:01 2020 -0500

Merge branch 'maint-0.4.2' into release-0.4.2

 changes/bug32771| 4 
 changes/ticket32765 | 4 
 src/lib/confmgt/structvar.c | 4 ++--
 src/lib/log/util_bug.h  | 6 --
 4 files changed, 14 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] Use CHECK_PRINTF() for printf-like functions in util_bug.h

2020-01-06 Thread nickm

commit 1b619a627ca1ee11d1680dc56e90e9fc1af2ddb5
Author: Nick Mathewson 
Date:   Mon Dec 16 15:14:13 2019 -0500

Use CHECK_PRINTF() for printf-like functions in util_bug.h
---
 changes/ticket32765| 4 
 src/lib/log/util_bug.h | 6 --
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/changes/ticket32765 b/changes/ticket32765
new file mode 100644
index 0..a9663a5df
--- /dev/null
+++ b/changes/ticket32765
@@ -0,0 +1,4 @@
+  o Minor bugfixes (correctness checks):
+- Use GCC/Clang's printf-checking feature to make sure that
+  tor_assertf() arguments are correctly typed. Fixes bug 32765;
+  bugfix on 0.4.1.1-alpha.
diff --git a/src/lib/log/util_bug.h b/src/lib/log/util_bug.h
index 546ae1e3e..993a4e3ab 100644
--- a/src/lib/log/util_bug.h
+++ b/src/lib/log/util_bug.h
@@ -242,10 +242,12 @@
 
 void tor_assertion_failed_(const char *fname, unsigned int line,
const char *func, const char *expr,
-   const char *fmt, ...);
+   const char *fmt, ...)
+CHECK_PRINTF(5,6);
 void tor_bug_occurred_(const char *fname, unsigned int line,
const char *func, const char *expr,
-   int once, const char *fmt, ...);
+   int once, const char *fmt, ...)
+  CHECK_PRINTF(6,7);
 
 void tor_abort_(void) ATTR_NORETURN;
 



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

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1612' into maint-0.4.2

2020-01-06 Thread nickm

commit 6da989cfe8323418ee1f888287d0d65b21b60c1d
Merge: 2d8d6d1eb b4977d1aa
Author: Nick Mathewson 
Date:   Mon Jan 6 13:20:57 2020 -0500

Merge remote-tracking branch 'tor-github/pr/1612' into maint-0.4.2

 changes/bug32771| 4 
 changes/ticket32765 | 4 
 src/lib/confmgt/structvar.c | 4 ++--
 src/lib/log/util_bug.h  | 6 --
 4 files changed, 14 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/maint-0.4.2] Merge branch 'bug32765_041' into bug32771_042

2020-01-06 Thread nickm

commit df5c81fec0f25a684f1f7e68e80abcde5402d3ef
Merge: bd11fb109 1b619a627
Author: Nick Mathewson 
Date:   Mon Dec 16 15:27:18 2019 -0500

Merge branch 'bug32765_041' into bug32771_042

 changes/ticket32765| 4 
 src/lib/log/util_bug.h | 6 --
 2 files changed, 8 insertions(+), 2 deletions(-)




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

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

2020-01-06 Thread nickm

commit 48f734178362d3a8b490a23ceff202a2027a27fc
Merge: 13216f848 6da989cfe
Author: Nick Mathewson 
Date:   Mon Jan 6 13:24:01 2020 -0500

Merge branch 'maint-0.4.2'

 changes/bug32771| 4 
 changes/ticket32765 | 4 
 src/lib/confmgt/structvar.c | 4 ++--
 src/lib/log/util_bug.h  | 6 --
 4 files changed, 14 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/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1612' into maint-0.4.2

2020-01-06 Thread nickm

commit 6da989cfe8323418ee1f888287d0d65b21b60c1d
Merge: 2d8d6d1eb b4977d1aa
Author: Nick Mathewson 
Date:   Mon Jan 6 13:20:57 2020 -0500

Merge remote-tracking branch 'tor-github/pr/1612' into maint-0.4.2

 changes/bug32771| 4 
 changes/ticket32765 | 4 
 src/lib/confmgt/structvar.c | 4 ++--
 src/lib/log/util_bug.h  | 6 --
 4 files changed, 14 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/maint-0.4.2] Use CHECK_PRINTF() for printf-like functions in util_bug.h

2020-01-06 Thread nickm

commit 1b619a627ca1ee11d1680dc56e90e9fc1af2ddb5
Author: Nick Mathewson 
Date:   Mon Dec 16 15:14:13 2019 -0500

Use CHECK_PRINTF() for printf-like functions in util_bug.h
---
 changes/ticket32765| 4 
 src/lib/log/util_bug.h | 6 --
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/changes/ticket32765 b/changes/ticket32765
new file mode 100644
index 0..a9663a5df
--- /dev/null
+++ b/changes/ticket32765
@@ -0,0 +1,4 @@
+  o Minor bugfixes (correctness checks):
+- Use GCC/Clang's printf-checking feature to make sure that
+  tor_assertf() arguments are correctly typed. Fixes bug 32765;
+  bugfix on 0.4.1.1-alpha.
diff --git a/src/lib/log/util_bug.h b/src/lib/log/util_bug.h
index 546ae1e3e..993a4e3ab 100644
--- a/src/lib/log/util_bug.h
+++ b/src/lib/log/util_bug.h
@@ -242,10 +242,12 @@
 
 void tor_assertion_failed_(const char *fname, unsigned int line,
const char *func, const char *expr,
-   const char *fmt, ...);
+   const char *fmt, ...)
+CHECK_PRINTF(5,6);
 void tor_bug_occurred_(const char *fname, unsigned int line,
const char *func, const char *expr,
-   int once, const char *fmt, ...);
+   int once, const char *fmt, ...)
+  CHECK_PRINTF(6,7);
 
 void tor_abort_(void) ATTR_NORETURN;
 



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

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

2020-01-06 Thread translation

commit 6a4f3d047ca32e910b5d78302cc271cedf6f38d3
Author: Translation commit bot 
Date:   Mon Jan 6 18:25:02 2020 +

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

diff --git a/contents+de.po b/contents+de.po
index 67398ae686..67e2e5afc3 100644
--- a/contents+de.po
+++ b/contents+de.po
@@ -3209,6 +3209,11 @@ msgid ""
 "[Firewalled](https://2019.www.torproject.org/docs/faq.html.en#FirewallPorts)"
 " clients for how to restrict what ports your Tor will try to access."
 msgstr ""
+"Falls dein Proxy es nur erlaubt sich mit bestimmten Punkten zu verbinden, "
+"schau dir den Eintrag Ã¼ber [Clients mit "
+"Firewall](https://2019.www.torproject.org/docs/faq.html.en#FirewallPorts) "
+"an, um zu lernen, wie du beschrÃ¤nkst, auf welche Ports deine Tor-"
+"Installation versuchen wird zuzugreifen,"
 
 #: https//support.torproject.org/tbb/tbb-5/
 #: (content/tbb/tbb-5/contents+en.lrquestion.title)
@@ -3391,6 +3396,8 @@ msgid ""
 "What is the difference between using Tor Browser and 'Incognito mode' or "
 "private tabs?"
 msgstr ""
+"Was ist der Unterschied zwischen Tor Browser und \"Inkognitomodus\", oder "
+"privaten Tabs?"
 
 #: https//support.torproject.org/tbb/tbb-and-incognito-mode/
 #: (content/tbb/tbb-and-incognito-mode/contents+en.lrquestion.description)
@@ -3398,6 +3405,8 @@ msgid ""
 "While the names may imply otherwise, 'Incognito mode' and 'private tabs' do "
 "not make you anonymous on the Internet."
 msgstr ""
+"Auch wenn die Namen vielleicht etwas anderes suggerieren, \"Inkognitomodus\""
+" und \"private Tabs\" machen dich nicht anonym im Internet."
 
 #: https//support.torproject.org/tbb/tbb-and-incognito-mode/
 #: (content/tbb/tbb-and-incognito-mode/contents+en.lrquestion.description)
@@ -3406,6 +3415,10 @@ msgid ""
 "session after they are closed, but have no measures in place to hide your "
 "activity or digital fingerprint online."
 msgstr ""
+"Sie entfernen alle Informationen auf deiner Maschine, die etwas mit der "
+"Browser-Sitzung zu tun haben, nachdem sie geschlossen werden, aber sie haben"
+" keine Mittel um deine AktivitÃ¤t oder deinen digitalen Fingerabdruck online "
+"zu verstecken."
 
 #: https//support.torproject.org/tbb/tbb-and-incognito-mode/
 #: (content/tbb/tbb-and-incognito-mode/contents+en.lrquestion.description)
@@ -3413,6 +3426,8 @@ msgid ""
 "This means that an observer can collect your traffic just as easily as any "
 "regular browser."
 msgstr ""
+"Das bedeutet, dass ein Beobachter deinen Datenverkehr so einfach "
+"mitschreiben kann, wie bei jedem normalen Browser."
 
 #: https//support.torproject.org/tbb/tbb-and-incognito-mode/
 #: (content/tbb/tbb-and-incognito-mode/contents+en.lrquestion.description)
@@ -3422,6 +3437,11 @@ msgid ""
 " used to fingerprint activity across the web, allowing for a truly private "
 "browsing session that's fully obfuscated from end-to-end."
 msgstr ""
+"Tor Browser bietet alle diese amnestischen Funktionen von privaten Tabs, "
+"wÃ¤hrend er die ursprÃ¼ngliche IP, Surfgewohnheiten und Details Ã¼ber ein "
+"GerÃ¤t, die dafÃ¼r benutzt werden kÃ¶nnten es im Netz wiederzuerkennen, "
+"verbirgt. Was wirklich private Sitzungen erlaubt, welche vollstÃ¤ndig von "
+"Ende zu Ende verschleiert sind."
 
 #: https//support.torproject.org/tbb/tbb-and-incognito-mode/
 #: (content/tbb/tbb-and-incognito-mode/contents+en.lrquestion.description)
@@ -3431,17 +3451,23 @@ msgid ""
 "Browsing](https://support.mozilla.org/en-US/kb/common-myths-about-private-;
 "browsing)."
 msgstr ""
+"FÃ¼r mehr Informationen Ã¼ber die Limitationen des Inkognitomoduses und der "
+"privaten Tabs, schau dir Mozilla's Artikel Ã¼ber [gewÃ¶hnliche Mythen Ã¼ber "
+"privates Browsing](https://support.mozilla.org/en-US/kb/common-myths-about-;
+"private-browsing) an."
 
 #: https//support.torproject.org/tbb/tbb-editing-torrc/
 #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.title)
 msgid "I'm supposed to \"edit my torrc\". What does that mean?"
-msgstr ""
+msgstr "Ich soll \"meine torrc bearbeiten\". Was bedeutet das?"
 
 #: https//support.torproject.org/tbb/tbb-editing-torrc/
 #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description)
 msgid ""
 "WARNING: Do NOT follow random advice instructing you to edit your `torrc`!"
 msgstr ""
+"WARNUNG: Folge NICHT irgendwelchen Anleitungen, um deine \"torrc\" zu "
+"editieren!"
 
 #: https//support.torproject.org/tbb/tbb-editing-torrc/
 #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description)

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

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

2020-01-06 Thread translation

commit 9ebc607ec413527106964fd78d9d32691cc5b14a
Author: Translation commit bot 
Date:   Mon Jan 6 17:54:52 2020 +

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

diff --git a/contents+de.po b/contents+de.po
index 16c890f535..67398ae686 100644
--- a/contents+de.po
+++ b/contents+de.po
@@ -9,9 +9,9 @@
 # Lars Schimmer , 2019
 # Emma Peel, 2019
 # Philipp . , 2019
-# Jonas KrÃ¶ber , 2020
 # Simon Kirchner , 2020
 # Curtis Baltimore , 2020
+# Jonas KrÃ¶ber , 2020
 # 
 msgid ""
 msgstr ""
@@ -19,7 +19,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-11-14 16:04+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Curtis Baltimore , 2020\n"
+"Last-Translator: Jonas KrÃ¶ber , 2020\n"
 "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -3175,6 +3175,16 @@ msgid ""
 "doing CONNECT requests to get to Tor relays. (It's fine if they're the same "
 "proxy.) Tor also recognizes the torrc options Socks4Proxy and Socks5Proxy."
 msgstr ""
+"Du kannst IP-Adresse des Proxys, Ports und Authentifikations-Informationen  "
+"in den [Tor Browser's Netzwerkeinstellungen](https://tb-;
+"manual.torproject.org/running-tor-browser/) Ã¤ndern. Falls du Tor Ã¼ber einen 
"
+"anderen Weg nutzt, sieh dir die Optionen fÃ¼r die HTTPProxy- und HTTPSProxy-"
+"Konfigurationen in der [Anleitung](https://2019.www.torproject.org/docs/tor-;
+"manual.html.en) an und modifiziere deine torrc-Datei entsprechend. Du wirst "
+"einen HTTP-Proxy brauchen, um GET-Anfragen zum holen des Tor Verzeichnisses "
+"zu tÃ¤tigen und du wirst einen HTTPS-Proxy  brauchen, um dich Ã¼ber CONNECT "
+"mit einem Tor-Relais zu verbinden. (Wenn sie derselbe Proxy sind, ist das in"
+" Ordnung.) Tor erkennt auch die torrc-Optionen Socks4Proxy und Socks5Proxy."
 
 #: https//support.torproject.org/tbb/tbb-47/
 #: (content/tbb/tbb-47/contents+en.lrquestion.description)
@@ -3184,6 +3194,12 @@ msgid ""
 "but if you need NTLM authentication, you may find [this post in the "
 "archives](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) useful."
 msgstr ""
+"Lies dir auch die HTTPProxyAuthenticator und HTTPSProxyAuthenticator "
+"Optionen durch, wenn dein Proxy eine Authentifikation braucht. Wir "
+"unterstÃ¼tzen momentan nur einfache Auth., aber wenn du NTLM-Authentifikation"
+" brauchst, findest du vielleicht [diesen Post, in den "
+"Archiven,](https://archives.seul.org/or/talk/Jun-2005/msg00223.html) "
+"nÃ¼tzlich."
 
 #: https//support.torproject.org/tbb/tbb-47/
 #: (content/tbb/tbb-47/contents+en.lrquestion.description)

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

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

2020-01-06 Thread translation

commit 42085fc7977fd797d6470a2f647961316edbcd62
Author: Translation commit bot 
Date:   Mon Jan 6 17:24:44 2020 +

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

diff --git a/contents+ar.po b/contents+ar.po
index 392037effa..48892a15d4 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -1982,6 +1982,10 @@ msgid ""
 "parameters) and [paper](https://www-;
 "users.cs.umn.edu/~hoppernj/single_guard.pdf) on entry guards."
 msgstr ""
+"ÙÙÙØ²ÙØ¯ ÙÙ Ø§ÙÙØ¹ÙÙÙØ§Øª Ø¹Ù ÙÙÙÙØ© Ø¹ÙÙ ÙØµÙØ§Øª 
Ø§ÙØØ§Ø±Ø³Ø Ø§ÙØ¸Ø± ÙØ°Ø§ [Ø§ÙÙÙØ§Ù ÙÙ "
+"Ø§ÙÙ
Ø¯ÙÙØ©](https://blog.torproject.org/improving-tors-anonymity-changing-;
+"guard-parameters) Ù ÙØ°Ù [Ø§ÙØ±Ø³Ø§ÙØ©](https://www-;
+"users.cs.umn.edu/~hoppernj/single_guard.pdf) Ø¹Ù ØØ±Ø§Ø³ Ø§ÙØ¯Ø®ÙÙ."
 
 #: https//support.torproject.org/tbb/tbb-20/
 #: (content/tbb/tbb-20/contents+en.lrquestion.title)

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

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

2020-01-06 Thread translation

commit 32b90205f582540e11f1fcfc639d70302e90fd84
Author: Translation commit bot 
Date:   Mon Jan 6 16:55:01 2020 +

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

diff --git a/contents+ar.po b/contents+ar.po
index 5cd2efaf57..392037effa 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -1944,17 +1944,17 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-2/
 #: (content/tbb/tbb-2/contents+en.lrquestion.title)
 msgid "Why is the first IP address in my relay circuit always the same?"
-msgstr ""
+msgstr "ÙÙØ§Ø°Ø§ Ø£ÙÙ Ø¹ÙÙØ§Ù Ø£Ù Ø¨Ù IP ÙÙ Ø¯Ø§Ø¦Ø±Ø© ÙØµÙØ§ØªÙ 
Ø«Ø§Ø¨Øª Ø¯Ø§Ø¦ÙØ§Ø"
 
 #: https//support.torproject.org/tbb/tbb-2/
 #: (content/tbb/tbb-2/contents+en.lrquestion.description)
 msgid "That is normal Tor behavior."
-msgstr ""
+msgstr "ÙØ°Ø§ ØªØµØ±Ù Ø¹Ø§Ø¯Ù ÙØªÙØ±."
 
 #: https//support.torproject.org/tbb/tbb-2/
 #: (content/tbb/tbb-2/contents+en.lrquestion.description)
 msgid "The first relay in your circuit is called an \"entry guard\" or 
\"guard\"."
-msgstr ""
+msgstr "Ø£ÙÙ ÙØµÙØ© ÙÙ Ø¯Ø§Ø¦Ø±ØªÙ ØªØ³ÙÙ \"ØØ§Ø±Ø³ Ø§ÙØ¯Ø®ÙÙ\" 
Ø£Ù \"ØØ§Ø±Ø³\"."
 
 #: https//support.torproject.org/tbb/tbb-2/
 #: (content/tbb/tbb-2/contents+en.lrquestion.description)
@@ -1962,6 +1962,8 @@ msgid ""
 "It is a fast and stable relay that remains the first one in your circuit for"
 " 2-3 months in order to protect against a known anonymity-breaking attack."
 msgstr ""
+"ÙÙ ÙØµÙØ© Ø³Ø±ÙØ¹Ø© Ù ÙØ³ØªÙØ±Ø© Ù ØªØ¨ÙÙ Ø£ÙÙ ÙØ§ØØ¯Ø© ÙÙ 
Ø¯Ø§Ø¦Ø±ØªÙ ÙÙØ¯Ø© 2-3 Ø´ÙÙØ± ÙÙÙ ØªØÙÙ ÙÙ "
+"ÙØ¬ÙÙ ÙØ¹Ø±ÙÙ ÙØ§Ø³Ø± ÙØ³Ø±ÙØ© Ø§ÙÙÙÙØ©."
 
 #: https//support.torproject.org/tbb/tbb-2/
 #: (content/tbb/tbb-2/contents+en.lrquestion.description)
@@ -1969,6 +1971,8 @@ msgid ""
 "The rest of your circuit changes with every new website you visit, and all "
 "together these relays provide the full privacy protections of Tor."
 msgstr ""
+"Ø¨Ø§ÙÙ Ø¯Ø§Ø¦Ø±ØªÙ ÙØªØºÙØ± ÙØ¹ ÙÙ ÙÙÙØ¹ Ø¬Ø¯ÙØ¯ ØªØ²ÙØ±ÙØ Ù 
ÙÙ ÙØ°Ù Ø§ÙÙØµÙØ§Øª ÙØ¬ØªÙØ¹Ø© ØªÙØ¯Ù "
+"Ø§ÙØÙØ§ÙØ© Ø§ÙÙØ§ÙÙØ© ÙÙØ®ØµÙØµÙØ©  Ø§ÙØ®Ø§ØµØ© Ø¨ØªÙØ±."
 
 #: https//support.torproject.org/tbb/tbb-2/
 #: (content/tbb/tbb-2/contents+en.lrquestion.description)

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

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

2020-01-06 Thread translation

commit 1c4cfad72e5c85f0e5620b131eabeaf381255d8e
Author: Translation commit bot 
Date:   Mon Jan 6 16:25:00 2020 +

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

diff --git a/contents+ar.po b/contents+ar.po
index 6035fb74ae..5cd2efaf57 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -1915,6 +1915,9 @@ msgid ""
 "choosing \"configure\" (then following the prompts) in the Tor Launcher "
 "window that pops up when you open Tor Browser for the first time."
 msgstr ""
+"Ø¨Ø¹Ø¶ Ø§ÙØ¬Ø³ÙØ± ÙÙØ¬ÙØ¯Ø© Ø¨Ø§ÙØ£Ø³Ø§Ø³ ÙÙ ÙØªØµÙØ ØªÙØ±Ø Ù 
ÙÙÙÙÙ Ø¥Ø³ØªØ®Ø¯Ø§Ù ÙØ°Ù Ø§ÙØ¬Ø³ÙØ± Ø¹Ù Ø·Ø±ÙÙ "
+"Ø§Ø®ØªÙØ§Ø± \"Ø¥Ø¹Ø¯Ø§Ø¯ configure\" (Ù ÙÙ Ø«Ù ØªØªØ¨Ø¹ Ø§ÙØªÙØ¬ÙÙ) 
ÙÙ ÙØ§ÙØ°Ø© Ø¥Ø·ÙØ§Ù ØªÙØ± Ø§ÙØªÙ "
+"ØªØ¸ÙØ± ØÙÙ ØªÙØªØ ÙØªØµÙØ ØªÙØ± ÙÙÙØ±Ø© Ø§ÙØ£ÙÙÙ."
 
 #: https//support.torproject.org/tbb/tbb-19/
 #: (content/tbb/tbb-19/contents+en.lrquestion.description)
@@ -1924,6 +1927,8 @@ msgid ""
 "If you need other bridges, you can get them at our [Bridges "
 "website](https://bridges.torproject.org/)."
 msgstr ""
+"Ø¥Ø°Ø§ ÙÙØª ØªØ±ÙØ¯ Ø¬Ø³ÙØ± Ø£Ø®Ø±ÙØ ÙÙÙÙÙ Ø¥ØØ¶Ø§Ø±ÙØ§ ÙÙ {Ù
ÙÙØ¹ "
+"Ø§ÙØ¬Ø³ÙØ±](https://bridges.torproject.org/?lang=ar) Ø§ÙØ®Ø§Øµ Ø¨ÙØ§."
 
 #: https//support.torproject.org/tbb/tbb-19/
 #: (content/tbb/tbb-19/contents+en.lrquestion.description)
@@ -1933,6 +1938,8 @@ msgid ""
 "For more information about bridges, see the [Tor Browser manual](https://tb-;
 "manual.torproject.org/bridges)."
 msgstr ""
+"ÙÙÙØ²ÙØ¯ ÙÙ Ø§ÙÙØ¹ÙÙÙØ§Øª Ø¹Ù Ø§ÙØ¬Ø³ÙØ±Ø Ø§ÙØ¸Ø± [Ø¯ÙÙÙ Ù
ØªØµÙØ ØªÙØ±](https://tb-;
+"manual.torproject.org/ar/bridges/)."
 
 #: https//support.torproject.org/tbb/tbb-2/
 #: (content/tbb/tbb-2/contents+en.lrquestion.title)

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

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

2020-01-06 Thread translation

commit ef2bd74a81e3f76b4ba26a74dd90c74a94e15c34
Author: Translation commit bot 
Date:   Mon Jan 6 15:55:16 2020 +

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

diff --git a/contents+ar.po b/contents+ar.po
index f470c4d1f4..6035fb74ae 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -1895,7 +1895,7 @@ msgstr ""
 #: https//support.torproject.org/censorship/censorship-4/
 #: (content/censorship/censorship-4/contents+en.lrquestion.title)
 msgid "I canât connect to Tor Browser, is my network censored?"
-msgstr ""
+msgstr "ÙØ§ Ø£Ø³ØªØ·ÙØ¹ Ø§ÙØ¥ØªØµØ§Ù Ø¨ÙØªØµÙØ ØªÙØ±Ø ÙÙ Ø´Ø¨ÙØªÙ 
ØªØ®Ø¶Ø¹ ÙÙØ±ÙØ§Ø¨Ø©Ø"
 
 #: https//support.torproject.org/tbb/tbb-19/
 #: (content/tbb/tbb-19/contents+en.lrquestion.description)
@@ -1904,6 +1904,7 @@ msgstr ""
 msgid ""
 "You might be on a censored network, and so you should try using bridges."
 msgstr ""
+"Ø±Ø¨ÙØ§ ØªÙÙÙ Ø¹ÙÙ Ø´Ø¨ÙØ© ØªØ®Ø¶Ø¹ ÙÙØ±ÙØ§ÙØ©Ø ÙØ°Ø§ ÙØ¬Ø¨ 
Ø¹ÙÙÙ Ø£Ù ØªØØ§ÙÙ Ø£Ù ØªØ³ØªØ®Ø¯Ù Ø§ÙØ¬Ø³ÙØ±."
 
 #: https//support.torproject.org/tbb/tbb-19/
 #: (content/tbb/tbb-19/contents+en.lrquestion.description)

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

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

2020-01-06 Thread translation

commit e956dd1eb0b227ee76f7e020b7b227e42220017f
Author: Translation commit bot 
Date:   Mon Jan 6 13:49:21 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_completed
---
 mk.po | 1069 
 tails.pot |  309 +-
 tr.po | 1087 -
 3 files changed, 291 insertions(+), 2174 deletions(-)

diff --git a/mk.po b/mk.po
deleted file mode 100644
index 12d34de5ac..00
--- a/mk.po
+++ /dev/null
@@ -1,1069 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Emma Peel, 2019
-# Matej Plavevski , 2019
-# Nena , 2019
-# Zarko Gjurov , 2019
-msgid ""
-msgstr ""
-"Project-Id-Version: Tor Project\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-28 17:02+0100\n"
-"PO-Revision-Date: 2019-12-21 22:23+\n"
-"Last-Translator: Zarko Gjurov \n"
-"Language-Team: Macedonian 
(http://www.transifex.com/otf/torproject/language/mk/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: mk\n"
-"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-
-#: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:42
-msgid "Tor is ready"
-msgstr "Tor Ðµ Ð¿Ð¾Ð´Ð³Ð¾ÑÐ²ÐµÐ½"
-
-#: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43
-msgid "You can now access the Internet."
-msgstr "Ð¡ÐµÐ³Ð° Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° Ð¿ÑÐ¸ÑÑÐ°Ð¿Ð¸ÑÐµ Ð½Ð° ÐÐ½ÑÐµÑÐ½ÐµÑ."
-
-#: config/chroot_local-includes/etc/whisperback/config.py:69
-#, python-format
-msgid ""
-"Help us fix your bug!\n"
-"Read our bug reporting instructions.\n"
-"Do not include more personal information than\n"
-"needed!\n"
-"About giving us an email address\n"
-"\n"
-"Giving us an email address allows us to contact you to clarify the problem. 
This\n"
-"is needed for the vast majority of the reports we receive as most reports\n"
-"without any contact information are useless. On the other hand it also 
provides\n"
-"an opportunity for eavesdroppers, like your email or Internet provider, to\n"
-"confirm that you are using Tails.\n"
-"\n"
-msgstr "ÐÐ¾Ð¼Ð¾Ð³Ð½ÐµÑÐµ Ð½Ð¸ Ð´Ð° ÑÐ° Ð¿Ð¾Ð¿ÑÐ°Ð²Ð¸Ð¼Ðµ Ð²Ð°ÑÐ°ÑÐ° 
Ð³ÑÐµÑÐºÐ°!\nÐÑÐ¾ÑÐ¸ÑÐ°ÑÑÐµ Ð³Ð¸ Ð½Ð°ÑÐ¸ÑÐµ 
Ð¸Ð½ÑÑÑÑÐºÑÐ¸Ð¸ Ð·Ð° Ð¿ÑÐ¸ÑÐ°Ð²ÑÐ²Ð°ÑÐµ Ð½Ð° 
Ð³ÑÐµÑÐºÐ°.\nÐÐµ Ð²ÐºÐ»ÑÑÑÐ²Ð°Ñ Ð»Ð¸ÑÐ½Ð¸ 
Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð¿Ð¾Ð²ÐµÑÐµ Ð¾ÑÐºÐ¾Ð»ÐºÑ ÑÑÐ¾ Ðµ 
Ð¿Ð¾ÑÑÐµÐ±Ð½Ð¾!\nÐÐ° Ð´Ð° Ð½Ð¸ Ð´Ð°Ð´ÐµÑÐµ Ð°Ð´ÑÐµÑÐ° 
Ð·Ð° Ðµ-Ð¿Ð¾ÑÑÐ°\n\nÐ¡Ð¾ Ð´Ð°Ð²Ð°ÑÐµÑÐ¾ Ð½Ð° Ð°Ð´ÑÐµÑÐ° Ð·Ð° 
Ðµ-Ð¿Ð¾ÑÑÐ° Ð½Ð¸ Ð¾Ð²Ð¾Ð·Ð¼Ð¾Ð¶ÑÐ²Ð°ÑÐµ Ð´Ð° Ð²Ðµ ÐºÐ¾Ð½ÑÐ°ÐºÑÐ¸ÑÐ°Ð¼Ðµ 
Ð·Ð° Ð´Ð° Ð³Ð¾ Ð¿Ð¾ÑÐ°ÑÐ½Ð¸Ð¼Ðµ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ð¾Ñ. ÐÐ²Ð°\nÐµ 
Ð¿Ð¾ÑÑÐµÐ±Ð½Ð¾ Ð·Ð° Ð¾Ð³ÑÐ¾Ð¼Ð½Ð¾ÑÐ¾ Ð¼Ð½Ð¾Ð·Ð¸Ð½ÑÑÐ²Ð¾ Ð½Ð° 
Ð¸Ð·Ð²ÐµÑÑÐ°Ð¸ ÐºÐ¾Ð¸ Ð³Ð¸ Ð´Ð¾Ð±Ð¸Ð²Ð°Ð¼Ðµ Ð° Ð½Ð°ÑÐ³Ð¾Ð»ÐµÐ¼Ð¸Ð¾Ñ 
Ð±ÑÐ¾Ñ Ð½Ð° Ð¸Ð·Ð²ÐµÑÑÐ°Ð¸\nÐ±ÐµÐ· Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð·Ð° ÐºÐ¾Ð½ÑÐ°ÐºÑ 
ÑÐµ Ð±ÐµÑÐºÐ¾ÑÐ¸ÑÐ½Ð¸. ÐÐ´ Ð´ÑÑÐ³Ð° ÑÑÑÐ°Ð½Ð° ÑÐ¾Ð° Ð¸ÑÑÐ¾ 
ÑÐ°ÐºÐ° Ð¸Ð¼ Ð´Ð°Ð²Ð°\nÐ¼Ð¾Ð¶Ð½Ð¾ÑÑ Ð½Ð° Ð¿ÑÐ¸ÑÐ»ÑÑÑÐ²Ð°ÑÐ¸ÑÐµ,
  ÐºÐ°ÐºÐ¾ Ð²Ð°ÑÐ°ÑÐ° Ðµ-Ð¿Ð¾ÑÑÐ° Ð¸Ð»Ð¸ ÐÐ½ÑÐµÑÐ½ÐµÑ 
Ð¿ÑÐ¾Ð²Ð°ÑÐ´ÐµÑÐ¾Ñ, Ð´Ð°\nÐ¿Ð¾ÑÐ²ÑÐ´Ð°Ñ Ð´ÐµÐºÐ° ÐºÐ¾ÑÐ¸ÑÑÐ¸ÑÐµ 
Tails.\n\n"
-
-#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
-#: 
../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
-msgid "Additional Software"
-msgstr "ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÐµÐ½ ÑÐ¾ÑÑÐ²ÐµÑ"
-
-#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:51
-msgid ""
-"You can install additional software automatically from your persistent "
-"storage when starting Tails."
-msgstr "ÐÐ¾Ð¶Ðµ Ð´Ð° Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°ÑÐµ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÐµÐ½ 
ÑÐ¾ÑÑÐ²ÐµÑ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÑÐºÐ¸ Ð¾Ð´ Ð²Ð°ÑÐ¸Ð¾Ñ Ð¿Ð¾ÑÑÐ¾ÑÐ°Ð½ 
ÑÐºÐ»Ð°Ð´ ÐºÐ¾Ð³Ð° ÑÐµ ÑÑÐ°ÑÑÑÐ²Ð° Tails."
-
-#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:77
-msgid ""
-"The following software is installed automatically from your persistent "
-"storage when starting Tails."
-msgstr "Ð¡Ð»ÐµÐ´Ð½Ð¸Ð¾Ñ ÑÐ¾ÑÑÐ²ÐµÑ Ðµ Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½ 
Ð°Ð²ÑÐ¾Ð¼Ð°ÑÑÐºÐ¸ Ð¾Ð´ Ð²Ð°ÑÐ¸Ð¾Ñ Ð¿Ð¾ÑÑÐ¾ÑÐ°Ð½ ÑÐºÐ»Ð°Ð´ ÐºÐ¾Ð³Ð° 
ÑÐµ ÑÑÐ°ÑÑÑÐ²Ð° Tails."
-
-#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:135
-#: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:171
-msgid ""
-"To add more, install some software using Synaptic Package Manager or APT on the command line."
-msgstr "ÐÐ° Ð´Ð° Ð´Ð¾Ð´Ð°Ð´ÐµÑÐµ Ð¿Ð¾Ð²ÐµÑÐµ, Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°ÑÑÐµ 
Ð½ÐµÐºÐ¾Ñ ÑÐ¾ÑÑÐ²ÐµÑ ÐºÐ¾ÑÐ¸ÑÑÐµÑÑÐ¸ Ð¡Ð¸Ð½Ð°Ð¿ÑÐ¸ÑÐµÐ½ Ð¿Ð°ÐºÐµÑ Ð¼ÐµÐ½Ð°ÑÐµÑ 
Ð¸Ð»Ð¸

[tor-commits] [tor/release-0.4.2] Fix sandbox crash during reload of logging configuration

2020-01-06 Thread nickm

commit b9d81282e0dbfdae795b38c26879716d7860bcf9
Author: Peter Gerber 
Date:   Sun Jan 5 15:48:54 2020 +0100

Fix sandbox crash during reload of logging configuration

Allow calls to dup() which was introduced in commit a22fbab986.

From a security perspective, I don't think this should impact the
security of the sandbox significantly. As far as I can tell, there
is nothing an adversary can do with a duplicated FD that can't be
done with the original.
---
 changes/bug32877  | 4 
 src/lib/sandbox/sandbox.c | 1 +
 2 files changed, 5 insertions(+)

diff --git a/changes/bug32877 b/changes/bug32877
new file mode 100644
index 0..96fe1af70
--- /dev/null
+++ b/changes/bug32877
@@ -0,0 +1,4 @@
+o Minor bugfixes (linux seccomp sandbox):
+  - Fix crash when reloading logging configuration while the
+experimental sandbox is enabled. Fixes bug 29150; bugfix
+on 0.4.1.7. Patch by Peter Gerber.
diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c
index faaf463f2..7e6354d88 100644
--- a/src/lib/sandbox/sandbox.c
+++ b/src/lib/sandbox/sandbox.c
@@ -143,6 +143,7 @@ static int filter_nopar_gen[] = {
 SCMP_SYS(clock_gettime),
 SCMP_SYS(close),
 SCMP_SYS(clone),
+SCMP_SYS(dup),
 SCMP_SYS(epoll_create),
 SCMP_SYS(epoll_wait),
 #ifdef __NR_epoll_pwait



___
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.2] Merge branch 'maint-0.4.1' into maint-0.4.2

2020-01-06 Thread nickm

commit 2d8d6d1ebfd62ebc6da931170d949d8c02f67b76
Merge: 16e94dc7a f5461a4bd
Author: Nick Mathewson 
Date:   Mon Jan 6 08:08:59 2020 -0500

Merge branch 'maint-0.4.1' into maint-0.4.2

 changes/bug32841 | 4 
 changes/bug32877 | 4 
 2 files changed, 4 insertions(+), 4 deletions(-)



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

[tor-commits] [tor/release-0.4.1] update changes file to pass "make check-changes"

2020-01-06 Thread nickm

commit f5461a4bdf343a0572b0594fa33af37ce1be9d8f
Author: Nick Mathewson 
Date:   Mon Jan 6 08:08:48 2020 -0500

update changes file to pass "make check-changes"
---
 changes/bug32841 | 4 
 changes/bug32877 | 4 
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/changes/bug32841 b/changes/bug32841
new file mode 100644
index 0..48568f6a6
--- /dev/null
+++ b/changes/bug32841
@@ -0,0 +1,4 @@
+  o Minor bugfixes (linux seccomp sandbox):
+- Fix crash when reloading logging configuration while the
+  experimental sandbox is enabled. Fixes bug 32841; bugfix
+  on 0.4.1.7. Patch by Peter Gerber.
diff --git a/changes/bug32877 b/changes/bug32877
deleted file mode 100644
index 96fe1af70..0
--- a/changes/bug32877
+++ /dev/null
@@ -1,4 +0,0 @@
-o Minor bugfixes (linux seccomp sandbox):
-  - Fix crash when reloading logging configuration while the
-experimental sandbox is enabled. Fixes bug 29150; bugfix
-on 0.4.1.7. Patch by Peter Gerber.



___
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.2] Merge branch 'maint-0.4.1' into maint-0.4.2

2020-01-06 Thread nickm

commit 16e94dc7a70e90fe7a1617ffeef817f3394fe382
Merge: 5dbb607e9 b9d81282e
Author: Nick Mathewson 
Date:   Mon Jan 6 08:06:54 2020 -0500

Merge branch 'maint-0.4.1' into maint-0.4.2

 changes/bug32877  | 4 
 src/lib/sandbox/sandbox.c | 1 +
 2 files changed, 5 insertions(+)




___
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

2020-01-06 Thread nickm

commit bdc870e6f5e6eb25f40644614ab5ad4479c9cb9d
Merge: 8b685622f f5461a4bd
Author: Nick Mathewson 
Date:   Mon Jan 6 08:08:59 2020 -0500

Merge branch 'maint-0.4.1' into release-0.4.1

 changes/bug32841 | 4 
 changes/bug32877 | 4 
 2 files changed, 4 insertions(+), 4 deletions(-)

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

[tor-commits] [tor/release-0.4.2] update changes file to pass "make check-changes"

2020-01-06 Thread nickm

commit f5461a4bdf343a0572b0594fa33af37ce1be9d8f
Author: Nick Mathewson 
Date:   Mon Jan 6 08:08:48 2020 -0500

update changes file to pass "make check-changes"
---
 changes/bug32841 | 4 
 changes/bug32877 | 4 
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/changes/bug32841 b/changes/bug32841
new file mode 100644
index 0..48568f6a6
--- /dev/null
+++ b/changes/bug32841
@@ -0,0 +1,4 @@
+  o Minor bugfixes (linux seccomp sandbox):
+- Fix crash when reloading logging configuration while the
+  experimental sandbox is enabled. Fixes bug 32841; bugfix
+  on 0.4.1.7. Patch by Peter Gerber.
diff --git a/changes/bug32877 b/changes/bug32877
deleted file mode 100644
index 96fe1af70..0
--- a/changes/bug32877
+++ /dev/null
@@ -1,4 +0,0 @@
-o Minor bugfixes (linux seccomp sandbox):
-  - Fix crash when reloading logging configuration while the
-experimental sandbox is enabled. Fixes bug 29150; bugfix
-on 0.4.1.7. Patch by Peter Gerber.



___
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] Fix sandbox crash during reload of logging configuration

2020-01-06 Thread nickm

commit b9d81282e0dbfdae795b38c26879716d7860bcf9
Author: Peter Gerber 
Date:   Sun Jan 5 15:48:54 2020 +0100

Fix sandbox crash during reload of logging configuration

Allow calls to dup() which was introduced in commit a22fbab986.

From a security perspective, I don't think this should impact the
security of the sandbox significantly. As far as I can tell, there
is nothing an adversary can do with a duplicated FD that can't be
done with the original.
---
 changes/bug32877  | 4 
 src/lib/sandbox/sandbox.c | 1 +
 2 files changed, 5 insertions(+)

diff --git a/changes/bug32877 b/changes/bug32877
new file mode 100644
index 0..96fe1af70
--- /dev/null
+++ b/changes/bug32877
@@ -0,0 +1,4 @@
+o Minor bugfixes (linux seccomp sandbox):
+  - Fix crash when reloading logging configuration while the
+experimental sandbox is enabled. Fixes bug 29150; bugfix
+on 0.4.1.7. Patch by Peter Gerber.
diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c
index faaf463f2..7e6354d88 100644
--- a/src/lib/sandbox/sandbox.c
+++ b/src/lib/sandbox/sandbox.c
@@ -143,6 +143,7 @@ static int filter_nopar_gen[] = {
 SCMP_SYS(clock_gettime),
 SCMP_SYS(close),
 SCMP_SYS(clone),
+SCMP_SYS(dup),
 SCMP_SYS(epoll_create),
 SCMP_SYS(epoll_wait),
 #ifdef __NR_epoll_pwait



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

[tor-commits] [tor/master] Fix sandbox crash during reload of logging configuration

2020-01-06 Thread nickm

commit b9d81282e0dbfdae795b38c26879716d7860bcf9
Author: Peter Gerber 
Date:   Sun Jan 5 15:48:54 2020 +0100

Fix sandbox crash during reload of logging configuration

Allow calls to dup() which was introduced in commit a22fbab986.

From a security perspective, I don't think this should impact the
security of the sandbox significantly. As far as I can tell, there
is nothing an adversary can do with a duplicated FD that can't be
done with the original.
---
 changes/bug32877  | 4 
 src/lib/sandbox/sandbox.c | 1 +
 2 files changed, 5 insertions(+)

diff --git a/changes/bug32877 b/changes/bug32877
new file mode 100644
index 0..96fe1af70
--- /dev/null
+++ b/changes/bug32877
@@ -0,0 +1,4 @@
+o Minor bugfixes (linux seccomp sandbox):
+  - Fix crash when reloading logging configuration while the
+experimental sandbox is enabled. Fixes bug 29150; bugfix
+on 0.4.1.7. Patch by Peter Gerber.
diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c
index faaf463f2..7e6354d88 100644
--- a/src/lib/sandbox/sandbox.c
+++ b/src/lib/sandbox/sandbox.c
@@ -143,6 +143,7 @@ static int filter_nopar_gen[] = {
 SCMP_SYS(clock_gettime),
 SCMP_SYS(close),
 SCMP_SYS(clone),
+SCMP_SYS(dup),
 SCMP_SYS(epoll_create),
 SCMP_SYS(epoll_wait),
 #ifdef __NR_epoll_pwait



___
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.2] Merge branch 'maint-0.4.1' into maint-0.4.2

2020-01-06 Thread nickm

commit 16e94dc7a70e90fe7a1617ffeef817f3394fe382
Merge: 5dbb607e9 b9d81282e
Author: Nick Mathewson 
Date:   Mon Jan 6 08:06:54 2020 -0500

Merge branch 'maint-0.4.1' into maint-0.4.2

 changes/bug32877  | 4 
 src/lib/sandbox/sandbox.c | 1 +
 2 files changed, 5 insertions(+)




___
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

2020-01-06 Thread nickm

commit 8b685622f843d1d450bf87356aa7055964421dd4
Merge: 69d7ea4db b9d81282e
Author: Nick Mathewson 
Date:   Mon Jan 6 08:06:54 2020 -0500

Merge branch 'maint-0.4.1' into release-0.4.1

 changes/bug32877  | 4 
 src/lib/sandbox/sandbox.c | 1 +
 2 files changed, 5 insertions(+)



___
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.2] Merge branch 'maint-0.4.2' into release-0.4.2

2020-01-06 Thread nickm

commit 77188ef36e9163b87f89135ff459f21100614b1e
Merge: 7b7aa4f07 2d8d6d1eb
Author: Nick Mathewson 
Date:   Mon Jan 6 08:08:59 2020 -0500

Merge branch 'maint-0.4.2' into release-0.4.2

 changes/bug32841 | 4 
 changes/bug32877 | 4 
 2 files changed, 4 insertions(+), 4 deletions(-)

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

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

2020-01-06 Thread nickm

commit 7b7aa4f070565fda111991f0d49342c977e42f02
Merge: 664a2c075 16e94dc7a
Author: Nick Mathewson 
Date:   Mon Jan 6 08:06:54 2020 -0500

Merge branch 'maint-0.4.2' into release-0.4.2

 changes/bug32877  | 4 
 src/lib/sandbox/sandbox.c | 1 +
 2 files changed, 5 insertions(+)



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

[tor-commits] [tor/master] update changes file to pass "make check-changes"

2020-01-06 Thread nickm

commit f5461a4bdf343a0572b0594fa33af37ce1be9d8f
Author: Nick Mathewson 
Date:   Mon Jan 6 08:08:48 2020 -0500

update changes file to pass "make check-changes"
---
 changes/bug32841 | 4 
 changes/bug32877 | 4 
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/changes/bug32841 b/changes/bug32841
new file mode 100644
index 0..48568f6a6
--- /dev/null
+++ b/changes/bug32841
@@ -0,0 +1,4 @@
+  o Minor bugfixes (linux seccomp sandbox):
+- Fix crash when reloading logging configuration while the
+  experimental sandbox is enabled. Fixes bug 32841; bugfix
+  on 0.4.1.7. Patch by Peter Gerber.
diff --git a/changes/bug32877 b/changes/bug32877
deleted file mode 100644
index 96fe1af70..0
--- a/changes/bug32877
+++ /dev/null
@@ -1,4 +0,0 @@
-o Minor bugfixes (linux seccomp sandbox):
-  - Fix crash when reloading logging configuration while the
-experimental sandbox is enabled. Fixes bug 29150; bugfix
-on 0.4.1.7. Patch by Peter Gerber.



___
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.2'

2020-01-06 Thread nickm

commit 13216f848a120760fa372b9ae8f6d0840f4a83ba
Merge: b062e0f0a 2d8d6d1eb
Author: Nick Mathewson 
Date:   Mon Jan 6 08:08:59 2020 -0500

Merge branch 'maint-0.4.2'

 changes/bug32841  | 4 
 src/lib/sandbox/sandbox.c | 1 +
 2 files changed, 5 insertions(+)

___
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.2] update changes file to pass "make check-changes"

2020-01-06 Thread nickm

commit f5461a4bdf343a0572b0594fa33af37ce1be9d8f
Author: Nick Mathewson 
Date:   Mon Jan 6 08:08:48 2020 -0500

update changes file to pass "make check-changes"
---
 changes/bug32841 | 4 
 changes/bug32877 | 4 
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/changes/bug32841 b/changes/bug32841
new file mode 100644
index 0..48568f6a6
--- /dev/null
+++ b/changes/bug32841
@@ -0,0 +1,4 @@
+  o Minor bugfixes (linux seccomp sandbox):
+- Fix crash when reloading logging configuration while the
+  experimental sandbox is enabled. Fixes bug 32841; bugfix
+  on 0.4.1.7. Patch by Peter Gerber.
diff --git a/changes/bug32877 b/changes/bug32877
deleted file mode 100644
index 96fe1af70..0
--- a/changes/bug32877
+++ /dev/null
@@ -1,4 +0,0 @@
-o Minor bugfixes (linux seccomp sandbox):
-  - Fix crash when reloading logging configuration while the
-experimental sandbox is enabled. Fixes bug 29150; bugfix
-on 0.4.1.7. Patch by Peter Gerber.



___
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' into maint-0.4.2

2020-01-06 Thread nickm

commit 16e94dc7a70e90fe7a1617ffeef817f3394fe382
Merge: 5dbb607e9 b9d81282e
Author: Nick Mathewson 
Date:   Mon Jan 6 08:06:54 2020 -0500

Merge branch 'maint-0.4.1' into maint-0.4.2

 changes/bug32877  | 4 
 src/lib/sandbox/sandbox.c | 1 +
 2 files changed, 5 insertions(+)




___
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.2] Merge branch 'maint-0.4.1' into maint-0.4.2

2020-01-06 Thread nickm

commit 2d8d6d1ebfd62ebc6da931170d949d8c02f67b76
Merge: 16e94dc7a f5461a4bd
Author: Nick Mathewson 
Date:   Mon Jan 6 08:08:59 2020 -0500

Merge branch 'maint-0.4.1' into maint-0.4.2

 changes/bug32841 | 4 
 changes/bug32877 | 4 
 2 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/maint-0.4.1] Fix sandbox crash during reload of logging configuration

2020-01-06 Thread nickm

commit b9d81282e0dbfdae795b38c26879716d7860bcf9
Author: Peter Gerber 
Date:   Sun Jan 5 15:48:54 2020 +0100

Fix sandbox crash during reload of logging configuration

Allow calls to dup() which was introduced in commit a22fbab986.

From a security perspective, I don't think this should impact the
security of the sandbox significantly. As far as I can tell, there
is nothing an adversary can do with a duplicated FD that can't be
done with the original.
---
 changes/bug32877  | 4 
 src/lib/sandbox/sandbox.c | 1 +
 2 files changed, 5 insertions(+)

diff --git a/changes/bug32877 b/changes/bug32877
new file mode 100644
index 0..96fe1af70
--- /dev/null
+++ b/changes/bug32877
@@ -0,0 +1,4 @@
+o Minor bugfixes (linux seccomp sandbox):
+  - Fix crash when reloading logging configuration while the
+experimental sandbox is enabled. Fixes bug 29150; bugfix
+on 0.4.1.7. Patch by Peter Gerber.
diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c
index faaf463f2..7e6354d88 100644
--- a/src/lib/sandbox/sandbox.c
+++ b/src/lib/sandbox/sandbox.c
@@ -143,6 +143,7 @@ static int filter_nopar_gen[] = {
 SCMP_SYS(clock_gettime),
 SCMP_SYS(close),
 SCMP_SYS(clone),
+SCMP_SYS(dup),
 SCMP_SYS(epoll_create),
 SCMP_SYS(epoll_wait),
 #ifdef __NR_epoll_pwait



___
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' into maint-0.4.2

2020-01-06 Thread nickm

commit 2d8d6d1ebfd62ebc6da931170d949d8c02f67b76
Merge: 16e94dc7a f5461a4bd
Author: Nick Mathewson 
Date:   Mon Jan 6 08:08:59 2020 -0500

Merge branch 'maint-0.4.1' into maint-0.4.2

 changes/bug32841 | 4 
 changes/bug32877 | 4 
 2 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/maint-0.4.2] Fix sandbox crash during reload of logging configuration

2020-01-06 Thread nickm

commit b9d81282e0dbfdae795b38c26879716d7860bcf9
Author: Peter Gerber 
Date:   Sun Jan 5 15:48:54 2020 +0100

Fix sandbox crash during reload of logging configuration

Allow calls to dup() which was introduced in commit a22fbab986.

From a security perspective, I don't think this should impact the
security of the sandbox significantly. As far as I can tell, there
is nothing an adversary can do with a duplicated FD that can't be
done with the original.
---
 changes/bug32877  | 4 
 src/lib/sandbox/sandbox.c | 1 +
 2 files changed, 5 insertions(+)

diff --git a/changes/bug32877 b/changes/bug32877
new file mode 100644
index 0..96fe1af70
--- /dev/null
+++ b/changes/bug32877
@@ -0,0 +1,4 @@
+o Minor bugfixes (linux seccomp sandbox):
+  - Fix crash when reloading logging configuration while the
+experimental sandbox is enabled. Fixes bug 29150; bugfix
+on 0.4.1.7. Patch by Peter Gerber.
diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c
index faaf463f2..7e6354d88 100644
--- a/src/lib/sandbox/sandbox.c
+++ b/src/lib/sandbox/sandbox.c
@@ -143,6 +143,7 @@ static int filter_nopar_gen[] = {
 SCMP_SYS(clock_gettime),
 SCMP_SYS(close),
 SCMP_SYS(clone),
+SCMP_SYS(dup),
 SCMP_SYS(epoll_create),
 SCMP_SYS(epoll_wait),
 #ifdef __NR_epoll_pwait



___
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] update changes file to pass "make check-changes"

2020-01-06 Thread nickm

commit f5461a4bdf343a0572b0594fa33af37ce1be9d8f
Author: Nick Mathewson 
Date:   Mon Jan 6 08:08:48 2020 -0500

update changes file to pass "make check-changes"
---
 changes/bug32841 | 4 
 changes/bug32877 | 4 
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/changes/bug32841 b/changes/bug32841
new file mode 100644
index 0..48568f6a6
--- /dev/null
+++ b/changes/bug32841
@@ -0,0 +1,4 @@
+  o Minor bugfixes (linux seccomp sandbox):
+- Fix crash when reloading logging configuration while the
+  experimental sandbox is enabled. Fixes bug 32841; bugfix
+  on 0.4.1.7. Patch by Peter Gerber.
diff --git a/changes/bug32877 b/changes/bug32877
deleted file mode 100644
index 96fe1af70..0
--- a/changes/bug32877
+++ /dev/null
@@ -1,4 +0,0 @@
-o Minor bugfixes (linux seccomp sandbox):
-  - Fix crash when reloading logging configuration while the
-experimental sandbox is enabled. Fixes bug 29150; bugfix
-on 0.4.1.7. Patch by Peter Gerber.

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

[tor-commits] [tor/master] Fix spacing in tor_inet_aton() function header

2020-01-06 Thread nickm

commit 01c6fde3265752f8e91084f5d1dd4788a96d8de9
Author: Neel Chauhan 
Date:   Fri Dec 20 14:10:43 2019 -0500

Fix spacing in tor_inet_aton() function header
---
 src/lib/net/inaddr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/net/inaddr.c b/src/lib/net/inaddr.c
index d9ae7cd56..79529c047 100644
--- a/src/lib/net/inaddr.c
+++ b/src/lib/net/inaddr.c
@@ -35,7 +35,7 @@
  * (Like inet_aton(str,addr), but works on Windows and Solaris.)
  */
 int
-tor_inet_aton(const char *str, struct in_addr* addr)
+tor_inet_aton(const char *str, struct in_addr *addr)
 {
   unsigned a,b,c,d;
   char more;



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

[tor-commits] [tor/master] Fix spacing in tor_sscanf() call in tor_inet_aton()

2020-01-06 Thread nickm

commit b062e0f0a4046724e349b92a3edf79141320422e
Author: Neel Chauhan 
Date:   Fri Dec 20 14:11:03 2019 -0500

Fix spacing in tor_sscanf() call in tor_inet_aton()
---
 src/lib/net/inaddr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/net/inaddr.c b/src/lib/net/inaddr.c
index 79529c047..a655ca6ad 100644
--- a/src/lib/net/inaddr.c
+++ b/src/lib/net/inaddr.c
@@ -39,7 +39,7 @@ tor_inet_aton(const char *str, struct in_addr *addr)
 {
   unsigned a,b,c,d;
   char more;
-  if (tor_sscanf(str, "%3u.%3u.%3u.%3u%c", ) != 4)
+  if (tor_sscanf(str, "%3u.%3u.%3u.%3u%c", , , , , ) != 4)
 return 0;
   if (a > 255) return 0;
   if (b > 255) return 0;

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

73 matches

Mail list logo