February 2017 - tor-commits - lists.torproject.org

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 24 Feb '17

24 Feb '17

commit c327525c3ea5e9dcabcb426fc23905407d62812f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 24 23:48:14 2017 +0000 Update translations for tails-greeter-2_completed --- pt_BR/pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index ab0d184..47cff07 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -162,7 +162,7 @@ msgstr "Configurar o Dispositivo de Armazenamento Persistente" msgid "Enter your passphrase to unlock the persistent storage" msgstr "" "Inserir a sua frase-senha para abrir o dispositivo de armazenamento " -"Persistente" +"persistente" #: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460 #: ../tailsgreeter/gui.py:510 @@ -171,7 +171,7 @@ msgstr "Abrir" #: ../data/greeter.ui.h:34 msgid "Relock Persistent Storage" -msgstr "Fechar o Dispositivo de Armazenamento Persistente de novo" +msgstr "Bloquear o Dispositivo de Armazenamento Persistente de novo" #: ../data/greeter.ui.h:35 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 24 Feb '17

24 Feb '17

commit 53d3de82ace16d1f88d4fa07d70a3ef1c62966eb Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 24 23:48:11 2017 +0000 Update translations for tails-greeter-2 --- pt_BR/pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index ab0d184..47cff07 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -162,7 +162,7 @@ msgstr "Configurar o Dispositivo de Armazenamento Persistente" msgid "Enter your passphrase to unlock the persistent storage" msgstr "" "Inserir a sua frase-senha para abrir o dispositivo de armazenamento " -"Persistente" +"persistente" #: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460 #: ../tailsgreeter/gui.py:510 @@ -171,7 +171,7 @@ msgstr "Abrir" #: ../data/greeter.ui.h:34 msgid "Relock Persistent Storage" -msgstr "Fechar o Dispositivo de Armazenamento Persistente de novo" +msgstr "Bloquear o Dispositivo de Armazenamento Persistente de novo" #: ../data/greeter.ui.h:35 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 24 Feb '17

24 Feb '17

commit eef489e8ffcb488ed83c0544d9919521bd97fafe Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 24 23:45:38 2017 +0000 Update translations for tails-persistence-setup_completed --- pt_BR/pt_BR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index a56de47..686f431 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Communia <ameaneantie(a)riseup.net>, 2013-2016 +# Communia <ameaneantie(a)riseup.net>, 2013-2017 # Bruno Geronimo <bruuh(a)outlook.com>, 2012 # carlo giusepe tadei valente sasaki <carlo.gt.valente(a)gmail.com>, 2014 # Communia <ameaneantie(a)riseup.net>, 2013 @@ -21,7 +21,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-05-25 02:27+0200\n" -"PO-Revision-Date: 2016-12-12 23:38+0000\n" +"PO-Revision-Date: 2017-02-24 23:36+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -166,7 +166,7 @@ msgstr "Não é possível suprimir o volume persistente durante o seu uso. Reini #: ../lib/Tails/Persistence/Setup.pm:385 msgid "Persistence volume is not unlocked." -msgstr "O volume Persistent não está aberto." +msgstr "O volume persistente não está aberto." #: ../lib/Tails/Persistence/Setup.pm:390 msgid "Persistence volume is not mounted."

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 24 Feb '17

24 Feb '17

commit a5db06dcef29a27f2e12a39802020cd3bca74dea Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 24 23:45:33 2017 +0000 Update translations for tails-persistence-setup --- pt_BR/pt_BR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index a56de47..686f431 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Communia <ameaneantie(a)riseup.net>, 2013-2016 +# Communia <ameaneantie(a)riseup.net>, 2013-2017 # Bruno Geronimo <bruuh(a)outlook.com>, 2012 # carlo giusepe tadei valente sasaki <carlo.gt.valente(a)gmail.com>, 2014 # Communia <ameaneantie(a)riseup.net>, 2013 @@ -21,7 +21,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-05-25 02:27+0200\n" -"PO-Revision-Date: 2016-12-12 23:38+0000\n" +"PO-Revision-Date: 2017-02-24 23:36+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -166,7 +166,7 @@ msgstr "Não é possível suprimir o volume persistente durante o seu uso. Reini #: ../lib/Tails/Persistence/Setup.pm:385 msgid "Persistence volume is not unlocked." -msgstr "O volume Persistent não está aberto." +msgstr "O volume persistente não está aberto." #: ../lib/Tails/Persistence/Setup.pm:390 msgid "Persistence volume is not mounted."

1 0

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 24 Feb '17

24 Feb '17

commit 52d47371af18a763d6bcb96a5d0dc5c49e196c0f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 24 23:18:14 2017 +0000 Update translations for tails-greeter-2_completed --- pt_BR/pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index a08066a..ab0d184 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -176,8 +176,8 @@ msgstr "Fechar o Dispositivo de Armazenamento Persistente de novo" #: ../data/greeter.ui.h:35 msgid "Your persistent storage is unlocked. Restart Tails to lock it again." msgstr "" -"O seu volume de armazenamento persitente está aberto. Reiniciar Tails para " -"trancá-lo novamente." +"O seu volume de armazenamento persistente está aberto. Reiniciar Tails para " +"bloqueá-lo novamente." #: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554 msgid "Additional Settings"

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 24 Feb '17

24 Feb '17

commit 0df539321adbe2f35469706d5087d0eb57029509 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 24 23:18:10 2017 +0000 Update translations for tails-greeter-2 --- pt_BR/pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index a08066a..ab0d184 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -176,8 +176,8 @@ msgstr "Fechar o Dispositivo de Armazenamento Persistente de novo" #: ../data/greeter.ui.h:35 msgid "Your persistent storage is unlocked. Restart Tails to lock it again." msgstr "" -"O seu volume de armazenamento persitente está aberto. Reiniciar Tails para " -"trancá-lo novamente." +"O seu volume de armazenamento persistente está aberto. Reiniciar Tails para " +"bloqueá-lo novamente." #: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554 msgid "Additional Settings"

1 0

[torsocks/master] Add a -q/--quiet to torsocks
by dgoulet＠torproject.org 24 Feb '17

24 Feb '17

commit 0b199d9e173a7c88adbf804a484c8320a802d74e Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Feb 24 15:14:23 2017 -0500 Add a -q/--quiet to torsocks This option disables all logging by setting TORSOCKS_LOG_LEVEL=1. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- doc/torsocks.1 | 3 +++ src/bin/torsocks.in | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/doc/torsocks.1 b/doc/torsocks.1 index e4ac628..4a691e1 100644 --- a/doc/torsocks.1 +++ b/doc/torsocks.1 @@ -61,6 +61,9 @@ and Password MUST NOT be set. .BR "\-d, \-\-debug" Activate the debug mode. Output will be written on stderr. .TP +.BR "\-q, \-\-quiet" +Suppress every log messages (even errors). +.TP .BR "on | off" This option adds or removes \fBtorsocks(8)\fP from the LD_PRELOAD environment variable for the current shell. If you want to use this option, you HAVE to diff --git a/src/bin/torsocks.in b/src/bin/torsocks.in index 15ffbfc..fe8b67a 100644 --- a/src/bin/torsocks.in +++ b/src/bin/torsocks.in @@ -294,6 +294,10 @@ do # Set full DEBUG with 5 being the highest possible level. export TORSOCKS_LOG_LEVEL=5 ;; + -q|--quiet) + # Silence logging. + export TORSOCKS_LOG_LEVEL=1 + ;; --shell) tor_shell break

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 24 Feb '17

24 Feb '17

commit d5ff137e3a809a879e682141578f29630172aea0 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 24 19:16:34 2017 +0000 Update translations for torbutton-torbuttonproperties --- fr/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torbutton.properties b/fr/torbutton.properties index e4ce25e..51421c9 100644 --- a/fr/torbutton.properties +++ b/fr/torbutton.properties @@ -19,7 +19,7 @@ torbutton.popup.launch = Télécharger le fichier torbutton.popup.cancel = Annuler torbutton.popup.dontask = Télécharger automatiquement à partir de maintenant torbutton.popup.prompted_language = Pour renforcer votre anonymat, BoutonTor peut demander la version anglaise des pages Web. Les pages que vous préférez lire dans votre langue préférée pourraient alors s'afficher en anglais.\n\nVoulez-vous demander des pages Web en anglais pour améliorer votre anonymat ? -torbutton.popup.no_newnym = BoutonTor ne peut pas vous délivrer une nouvelle identité de façon sûre. Il n'a pas accès au port de contrôle de Tor.\n\nUtilisez-vous le paquet de navigation Tor ? +torbutton.popup.no_newnym = BoutonTor ne peut pas vous délivrer une nouvelle identité de façon sûre. Il n'a pas accès au port de contrôle de Tor.\n\nUtilisez-vous l'offre groupée de navigation Tor ? torbutton.title.prompt_torbrowser = Informations importantes concernant BoutonTor torbutton.popup.prompt_torbrowser = BoutonTor fonctionne différemment maintenant : vous ne pouvez plus le désactiver.\n\nNous avons effectué ce changement car il n'est pas sécuritaire d'utiliser BoutonTor dans un navigateur qui est également utiliser pour une navigation sans Tor. Trop de bogues ne pouvaient être réglés autrement.\n\nSi vous voulez continuer à utiliser Firefox normalement, vous devriez désinstaller BoutonTor et télécharger l'offre groupée de navigation Tor. Les propriétés de confidentialité du navigateur Tor sont aussi supérieures à celles de Firefox, même s'il est utilisé avec BoutonTor.\n\nPour enlever BoutonTor, allez dans Outils->Modules complémentaires->Extensions et cliquer sur Supprimer à coté de BoutonTor. torbutton.popup.short_torbrowser = Informations importantes concernant BoutonTor !\n\nBoutonTor est dorénavant toujours activé.\n\nCliquer sur BoutonTor pour plus d'informations.

1 0

[torsocks/master] tests: Add a check for a running Tor
by dgoulet＠torproject.org 24 Feb '17

24 Feb '17

commit c5cde94da6cc627b7538d54d7388038e857de631 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Feb 24 13:46:24 2017 -0500 tests: Add a check for a running Tor With this check, we can skip tests that need a running tor when none is present. Also update the maatuska hostname for the DNS test. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- tests/Makefile.am | 6 ++++-- tests/helpers.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/helpers.h | 23 +++++++++++++++++++++++ tests/test_dns.c | 14 +++++++++++--- tests/test_getpeername.c | 8 ++++++++ 5 files changed, 94 insertions(+), 5 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index a1ee8b1..e703168 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -17,9 +17,11 @@ LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la LIBTORSOCKS=$(top_builddir)/src/lib/libtorsocks.la +HELPER_SOURCES = helpers.c helpers.h + noinst_PROGRAMS = test_dns test_socket test_connect test_fd_passing test_getpeername -test_dns_SOURCES = test_dns.c +test_dns_SOURCES = test_dns.c $(HELPER_SOURCES) test_dns_LDADD = $(LIBTAP) $(LIBTORSOCKS) test_socket_SOURCES = test_socket.c @@ -31,5 +33,5 @@ test_connect_LDADD = $(LIBTAP) $(LIBTORSOCKS) test_fd_passing_SOURCES = test_fd_passing.c test_fd_passing_LDADD = $(LIBTAP) $(LIBTORSOCKS) -lpthread -test_getpeername_SOURCES = test_getpeername.c +test_getpeername_SOURCES = test_getpeername.c $(HELPER_SOURCES) test_getpeername_LDADD = $(LIBTAP) $(LIBTORSOCKS) diff --git a/tests/helpers.c b/tests/helpers.c new file mode 100644 index 0000000..1029e0a --- /dev/null +++ b/tests/helpers.c @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2017 - David Goulet <dgoulet(a)ev0ke.net> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License, version 2 only, as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <arpa/inet.h> + +#include "lib/torsocks.h" + +#include "helpers.h" + +/* Try to connect to SocksPort localhost:9050 and if we can't skip. This is + * to avoid to have failing test if no tor daemon is available. Return 1 if + * true else 0. */ +int +helper_is_default_tor_running(void) +{ + int ret, fd; + struct sockaddr_in sa; + + fd = tsocks_libc_socket(AF_INET, SOCK_STREAM, 0); + if (fd < 0) { + goto end; + } + sa.sin_family = AF_INET; + sa.sin_port = htons(9050); + sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + ret = tsocks_libc_connect(fd, (const struct sockaddr *) &sa, sizeof(sa)); + close(fd); + if (ret < 0) { + goto end; + } + return 1; +end: + return 0; +} diff --git a/tests/helpers.h b/tests/helpers.h new file mode 100644 index 0000000..8cd0adb --- /dev/null +++ b/tests/helpers.h @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2017 - David Goulet <dgoulet(a)ev0ke.net> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License, version 2 only, as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef TORSOCKS_HELPERS_H +#define TORSOCKS_HELPERS_H + +int helper_is_default_tor_running(void); + +#endif /* TORSOCKS_HELPERS_H */ diff --git a/tests/test_dns.c b/tests/test_dns.c index 1ca3827..2d87744 100644 --- a/tests/test_dns.c +++ b/tests/test_dns.c @@ -24,6 +24,7 @@ #include <lib/torsocks.h> #include <tap/tap.h> +#include "helpers.h" #define NUM_TESTS 4 @@ -46,7 +47,7 @@ static const struct test_host tor_dir_auth1 = { /* maatuska directory authority. */ static const struct test_host tor_dir_auth2 = { - .name = "ehlo.4711.se", + .name = "maatuska.4711.se", .ip = "171.25.193.9", }; @@ -135,13 +136,20 @@ static void test_getaddrinfo(const struct test_host *host) int main(int argc, char **argv) { + /* Try to connect to SocksPort localhost:9050 and if we can't skip. This is + * to avoid to have failing test if no tor daemon is available. */ + if (!helper_is_default_tor_running()) { + goto end; + } + /* Libtap call for the number of tests planned. */ plan_tests(NUM_TESTS); test_getaddrinfo(&tor_check); - test_gethostbyname(&tor_dir_auth1); + test_gethostbyname(&tor_dir_auth1); test_gethostbyaddr(&tor_dir_auth2); test_getaddrinfo(&tor_localhost); - return 0; +end: + return 0; } diff --git a/tests/test_getpeername.c b/tests/test_getpeername.c index faf4149..c09e487 100644 --- a/tests/test_getpeername.c +++ b/tests/test_getpeername.c @@ -23,6 +23,7 @@ #include <lib/torsocks.h> #include <tap/tap.h> +#include "helpers.h" #define NUM_TESTS 7 @@ -102,10 +103,17 @@ error: int main(int argc, char **argv) { + /* Try to connect to SocksPort localhost:9050 and if we can't skip. This is + * to avoid to have failing test if no tor daemon is available. */ + if (!helper_is_default_tor_running()) { + goto end; + } + /* Libtap call for the number of tests planned. */ plan_tests(NUM_TESTS); test_getpeername(); +end: return 0; }

1 0

[torsocks/master] Make cpp conditional for definition of handle_mmap match use
by dgoulet＠torproject.org 24 Feb '17

24 Feb '17

commit 6520a009e1ba3c5f0c3a4e875aa4c8b396a3f2bc Author: Taylor R Campbell <campbell+torsocks(a)mumble.net> Date: Fri Feb 24 12:41:53 2017 -0500 Make cpp conditional for definition of handle_mmap match use Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/syscall.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/syscall.c b/src/lib/syscall.c index d0fdaaa..41cba28 100644 --- a/src/lib/syscall.c +++ b/src/lib/syscall.c @@ -84,7 +84,7 @@ static LIBC_ACCEPT_RET_TYPE handle_accept(va_list args) return tsocks_accept(sockfd, addr, &addrlen); } -#if (defined(__linux__) || defined(__darwin__) || (defined(__FreeBSD_kernel__) && defined(__i386__)) || defined(__NetBSD__)) +#if !((defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(__x86_64)) /* * Handle mmap(2) syscall. */ @@ -104,7 +104,7 @@ static LIBC_SYSCALL_RET_TYPE handle_mmap(va_list args) return (LIBC_SYSCALL_RET_TYPE) mmap(addr, len, prot, flags, fd, offset); } -#endif /* __linux__, __darwin__, __FreeBSD_kernel__, __i386__, __NetBSD__ */ +#endif /* __NetBSD__, __FreeBSD__, __FreeBSD_kernel__, __x86_64 */ /* * Handle munmap(2) syscall.

1 0