May 2015 - tor-commits - lists.torproject.org

[translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd
by translation＠torproject.org 13 May '15

13 May '15

commit 5a9df63862c4cc0f0f212ae046e57021206d4d71 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 13 00:16:05 2015 +0000 Update translations for torbutton-aboutdialogdtd --- fr/aboutdialog.dtd | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/fr/aboutdialog.dtd b/fr/aboutdialog.dtd index fb754f6..ddd6750 100644 --- a/fr/aboutdialog.dtd +++ b/fr/aboutdialog.dtd @@ -1,19 +1,19 @@ -<!ENTITY project.start "&brandShortName; is developed by "> +<!ENTITY project.start "&brandShortName; est développé par">  -<!ENTITY project.tpoLink "the &vendorShortName;"> -<!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> +<!ENTITY project.tpoLink "le &vendorShortName;"> +<!ENTITY project.end ", une organisation à but non lucratif travaillant à défendre votre vie privée et liberté en ligne."> -<!ENTITY help.start "Voulez-vous aider?"> +<!ENTITY help.start "Vous voulez aider?">  <!ENTITY help.donateLink "Faire une donation"> -<!ENTITY help.or " or "> +<!ENTITY help.or "ou">  -<!ENTITY help.getInvolvedLink "get involved"> +<!ENTITY help.getInvolvedLink "s'engager"> <!ENTITY help.end "!">  -<!ENTITY bottomLinks.questions "Questions?"> +<!ENTITY bottomLinks.questions "Des questions?">  -<!ENTITY bottomLinks.grow "Help the Tor Network Grow!"> +<!ENTITY bottomLinks.grow "Aider le réseau Tor à grandir!">  -<!ENTITY bottomLinks.license "Licensing Information"> -<!ENTITY tor.TrademarkStatement "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc."> +<!ENTITY bottomLinks.license "Information sur les licences"> +<!ENTITY tor.TrademarkStatement ""Tor" et le "Logo Oignon" sont des marques déposés du Projet Tor, Inc.">

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 13 May '15

13 May '15

commit 1762a235ad16ad604ad6678d168021dc1a84558b Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 12 23:46:06 2015 +0000 Update translations for torbutton-abouttorproperties --- fr/abouttor.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/abouttor.properties b/fr/abouttor.properties index d607324..dc23e01 100644 --- a/fr/abouttor.properties +++ b/fr/abouttor.properties @@ -2,13 +2,13 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +aboutTor.searchSP.privacy=Rechercher <a href="%1$S">de manière sécurisée</a> avec <a href="%2$S">Startpage</a>. # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.ht… # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +aboutTor.searchDDG.privacy=Rechercher <a href="%1$S">de manière sécurisée</a> avec <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above.

1 0

[translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed
by translation＠torproject.org 13 May '15

13 May '15

commit 2bd170ca3eb30503d0c09f7d39d118fd359af2bc Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 12 21:46:21 2015 +0000 Update translations for torbutton-aboutdialogdtd_completed --- pt_BR/aboutdialog.dtd | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pt_BR/aboutdialog.dtd b/pt_BR/aboutdialog.dtd new file mode 100644 index 0000000..ad4963e --- /dev/null +++ b/pt_BR/aboutdialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; é desenvolvida por "> + +<!ENTITY project.tpoLink "o &vendorShortName;"> +<!ENTITY project.end ", uma organizacao não governamental para defender a sua privacidade e liberdade na internet."> + +<!ENTITY help.start "Você gostaria de ajudar?"> + +<!ENTITY help.donateLink "Doar"> +<!ENTITY help.or "ou"> + +<!ENTITY help.getInvolvedLink "envolver-se"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Perguntas?"> + +<!ENTITY bottomLinks.grow "Ajude a Rede Tor a crescer!"> + +<!ENTITY bottomLinks.license "Informações de licenciamento "> +<!ENTITY tor.TrademarkStatement "'Tor' e o 'Logotipo Cebola' são marcas registradas do Projeto Tor, Inc.">

1 0

[translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd
by translation＠torproject.org 13 May '15

13 May '15

commit e7c2bffbacdc5e7139edf9da91d29db4bedcc7a0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 12 21:46:17 2015 +0000 Update translations for torbutton-aboutdialogdtd --- pt_BR/aboutdialog.dtd | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pt_BR/aboutdialog.dtd b/pt_BR/aboutdialog.dtd index 044d10d..ad4963e 100644 --- a/pt_BR/aboutdialog.dtd +++ b/pt_BR/aboutdialog.dtd @@ -1,19 +1,19 @@ <!ENTITY project.start "&brandShortName; é desenvolvida por ">  -<!ENTITY project.tpoLink "the &vendorShortName;"> -<!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> +<!ENTITY project.tpoLink "o &vendorShortName;"> +<!ENTITY project.end ", uma organizacao não governamental para defender a sua privacidade e liberdade na internet."> -<!ENTITY help.start "Want to help? "> +<!ENTITY help.start "Você gostaria de ajudar?">  <!ENTITY help.donateLink "Doar"> -<!ENTITY help.or " or "> +<!ENTITY help.or "ou">  -<!ENTITY help.getInvolvedLink "get involved"> +<!ENTITY help.getInvolvedLink "envolver-se"> <!ENTITY help.end "!">  -<!ENTITY bottomLinks.questions "Questions?"> +<!ENTITY bottomLinks.questions "Perguntas?">  -<!ENTITY bottomLinks.grow "Help the Tor Network Grow!"> +<!ENTITY bottomLinks.grow "Ajude a Rede Tor a crescer!">  -<!ENTITY bottomLinks.license "Licensing Information"> -<!ENTITY tor.TrademarkStatement "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc."> +<!ENTITY bottomLinks.license "Informações de licenciamento "> +<!ENTITY tor.TrademarkStatement "'Tor' e o 'Logotipo Cebola' são marcas registradas do Projeto Tor, Inc.">

1 0

[translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd
by translation＠torproject.org 13 May '15

13 May '15

commit 2241ec91e947ad5c8f8909692a9b4f0e7bf674d0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 12 21:16:14 2015 +0000 Update translations for torbutton-aboutdialogdtd --- pt_BR/aboutdialog.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/aboutdialog.dtd b/pt_BR/aboutdialog.dtd index c5a3e32..044d10d 100644 --- a/pt_BR/aboutdialog.dtd +++ b/pt_BR/aboutdialog.dtd @@ -1,4 +1,4 @@ -<!ENTITY project.start "&brandShortName; is developed by "> +<!ENTITY project.start "&brandShortName; é desenvolvida por ">  <!ENTITY project.tpoLink "the &vendorShortName;"> <!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online.">

1 0

[torsocks/master] Send the SOCKS5 authentication for RESOLVE/RESOLVE_PTR requests.
by dgoulet＠torproject.org 12 May '15

12 May '15

commit 88466864b595bd24710b0428c4e3ca483480046d Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Tue May 12 11:37:27 2015 +0000 Send the SOCKS5 authentication for RESOLVE/RESOLVE_PTR requests. Signed-off-by: Yawning Angel <yawning(a)schwanenlied.me> --- src/lib/torsocks.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/src/lib/torsocks.c b/src/lib/torsocks.c index be00581..5836c31 100644 --- a/src/lib/torsocks.c +++ b/src/lib/torsocks.c @@ -476,6 +476,7 @@ int tsocks_tor_resolve(int af, const char *hostname, void *ip_addr) int ret; size_t addr_len; struct connection conn; + uint8_t socks5_method; assert(hostname); assert(ip_addr); @@ -526,11 +527,33 @@ int tsocks_tor_resolve(int af, const char *hostname, void *ip_addr) goto error; } - ret = setup_tor_connection(&conn, SOCKS5_NO_AUTH_METHOD); + /* Is this configuration is set to use SOCKS5 authentication. */ + if (tsocks_config.socks5_use_auth) { + socks5_method = SOCKS5_USER_PASS_METHOD; + } else { + socks5_method = SOCKS5_NO_AUTH_METHOD; + } + + ret = setup_tor_connection(&conn, socks5_method); if (ret < 0) { goto end_close; } + /* For the user/pass method, send the request before resolve. */ + if (socks5_method == SOCKS5_USER_PASS_METHOD) { + ret = socks5_send_user_pass_request(&conn, + tsocks_config.conf_file.socks5_username, + tsocks_config.conf_file.socks5_password); + if (ret < 0) { + goto end_close; + } + + ret = socks5_recv_user_pass_reply(&conn); + if (ret < 0) { + goto end_close; + } + } + ret = socks5_send_resolve_request(hostname, &conn); if (ret < 0) { goto end_close; @@ -560,6 +583,7 @@ int tsocks_tor_resolve_ptr(const char *addr, char **ip, int af) { int ret; struct connection conn; + uint8_t socks5_method; assert(addr); assert(ip); @@ -574,11 +598,33 @@ int tsocks_tor_resolve_ptr(const char *addr, char **ip, int af) } conn.dest_addr.domain = CONNECTION_DOMAIN_INET; - ret = setup_tor_connection(&conn, SOCKS5_NO_AUTH_METHOD); + /* Is this configuration is set to use SOCKS5 authentication. */ + if (tsocks_config.socks5_use_auth) { + socks5_method = SOCKS5_USER_PASS_METHOD; + } else { + socks5_method = SOCKS5_NO_AUTH_METHOD; + } + + ret = setup_tor_connection(&conn, socks5_method); if (ret < 0) { goto end_close; } + /* For the user/pass method, send the request before resolve ptr. */ + if (socks5_method == SOCKS5_USER_PASS_METHOD) { + ret = socks5_send_user_pass_request(&conn, + tsocks_config.conf_file.socks5_username, + tsocks_config.conf_file.socks5_password); + if (ret < 0) { + goto end_close; + } + + ret = socks5_recv_user_pass_reply(&conn); + if (ret < 0) { + goto end_close; + } + } + ret = socks5_send_resolve_ptr_request(&conn, addr, af); if (ret < 0) { goto end_close;

1 0

[torsocks/master] Move SOCKS5 auth in a seperate function
by dgoulet＠torproject.org 12 May '15

12 May '15

commit ed1e2c6b87f0d3334511ae6c446ddab15a728a54 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Tue May 12 13:56:40 2015 -0400 Move SOCKS5 auth in a seperate function Too many places were using the same code so create auth_socks5() to do that using a given connection object. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/torsocks.c | 60 +++++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/src/lib/torsocks.c b/src/lib/torsocks.c index 5836c31..70014ce 100644 --- a/src/lib/torsocks.c +++ b/src/lib/torsocks.c @@ -408,6 +408,35 @@ error: } /* + * Using the given connection, do a SOCKS5 authentication with the + * username/password in the global configuration. + * + * Return 0 on success else a negative value on error. + */ +static int +auth_socks5(struct connection *conn) +{ + int ret; + + assert(conn); + + ret = socks5_send_user_pass_request(conn, + tsocks_config.conf_file.socks5_username, + tsocks_config.conf_file.socks5_password); + if (ret < 0) { + goto error; + } + + ret = socks5_recv_user_pass_reply(conn); + if (ret < 0) { + goto error; + } + +error: + return ret; +} + +/* * Initiate a SOCK5 connection to the Tor network using the given connection. * The socks5 API will use the torsocks configuration object to find the tor * daemon. If a username/password has been set use that method for the SOCKS5 @@ -439,14 +468,7 @@ int tsocks_connect_to_tor(struct connection *conn) /* For the user/pass method, send the request before connect. */ if (socks5_method == SOCKS5_USER_PASS_METHOD) { - ret = socks5_send_user_pass_request(conn, - tsocks_config.conf_file.socks5_username, - tsocks_config.conf_file.socks5_password); - if (ret < 0) { - goto error; - } - - ret = socks5_recv_user_pass_reply(conn); + ret = auth_socks5(conn); if (ret < 0) { goto error; } @@ -541,16 +563,9 @@ int tsocks_tor_resolve(int af, const char *hostname, void *ip_addr) /* For the user/pass method, send the request before resolve. */ if (socks5_method == SOCKS5_USER_PASS_METHOD) { - ret = socks5_send_user_pass_request(&conn, - tsocks_config.conf_file.socks5_username, - tsocks_config.conf_file.socks5_password); + ret = auth_socks5(&conn); if (ret < 0) { - goto end_close; - } - - ret = socks5_recv_user_pass_reply(&conn); - if (ret < 0) { - goto end_close; + goto error; } } @@ -612,16 +627,9 @@ int tsocks_tor_resolve_ptr(const char *addr, char **ip, int af) /* For the user/pass method, send the request before resolve ptr. */ if (socks5_method == SOCKS5_USER_PASS_METHOD) { - ret = socks5_send_user_pass_request(&conn, - tsocks_config.conf_file.socks5_username, - tsocks_config.conf_file.socks5_password); + ret = auth_socks5(&conn); if (ret < 0) { - goto end_close; - } - - ret = socks5_recv_user_pass_reply(&conn); - if (ret < 0) { - goto end_close; + goto error; } }

1 0

[translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
by translation＠torproject.org 12 May '15

12 May '15

commit c23e8842e3249171879d5df723b80b874c58ec74 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 12 17:16:18 2015 +0000 Update translations for torbutton-abouttorproperties_completed --- pt_BR/abouttor.properties | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pt_BR/abouttor.properties b/pt_BR/abouttor.properties new file mode 100644 index 0000000..6ee87d0 --- /dev/null +++ b/pt_BR/abouttor.properties @@ -0,0 +1,21 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Buscar <a href="%1$S">com segurança</a> utilizando <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/por/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Buscar <a href="%1$S">com segurança</a> utilizado <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.searchDC.privacy=Buscar <a href="%1$S">com segurança</a> utilizando <a href="%2$S">Disconnect.me</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 12 May '15

12 May '15

commit 6d909d1491452986d05b718e9e0b85e09d8cca1f Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 12 17:16:15 2015 +0000 Update translations for torbutton-abouttorproperties --- pt_BR/abouttor.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/abouttor.properties b/pt_BR/abouttor.properties index f3266d6..6ee87d0 100644 --- a/pt_BR/abouttor.properties +++ b/pt_BR/abouttor.properties @@ -2,19 +2,19 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +aboutTor.searchSP.privacy=Buscar <a href="%1$S">com segurança</a> utilizando <a href="%2$S">Startpage</a>. # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/por/protect-privacy.ht… # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +aboutTor.searchDDG.privacy=Buscar <a href="%1$S">com segurança</a> utilizado <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>. +aboutTor.searchDC.privacy=Buscar <a href="%1$S">com segurança</a> utilizando <a href="%2$S">Disconnect.me</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above.

1 0

[translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed
by translation＠torproject.org 12 May '15

12 May '15

commit 18e2fd65afb316f7c3c9aa4bc0f66f83443b274d Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 12 17:16:11 2015 +0000 Update translations for torbutton-aboutdialogdtd_completed --- en_GB/aboutdialog.dtd | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/en_GB/aboutdialog.dtd b/en_GB/aboutdialog.dtd new file mode 100644 index 0000000..5099ad7 --- /dev/null +++ b/en_GB/aboutdialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; is developed by "> + +<!ENTITY project.tpoLink "the &vendorShortName;"> +<!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> + +<!ENTITY help.start "Want to help? "> + +<!ENTITY help.donateLink "Donate"> +<!ENTITY help.or " or "> + +<!ENTITY help.getInvolvedLink "get involved"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Questions?"> + +<!ENTITY bottomLinks.grow "Help the Tor Network Grow!"> + +<!ENTITY bottomLinks.license "Licensing Information"> +<!ENTITY tor.TrademarkStatement "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">

1 0