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

[torsocks/master] Merge remote-tracking branch 'debian/bugfix/typo-subsytem'
by dgoulet＠torproject.org 04 Aug '17

04 Aug '17

commit c320f7e8de26c72915238804bfbb984e99a66035 Merge: 3c3a1a8 c822b5c Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Aug 4 14:41:19 2017 -0400 Merge remote-tracking branch 'debian/bugfix/typo-subsytem' src/lib/torsocks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[torsocks/master] Merge remote-tracking branch 'debian/bugfix/typo-catched'
by dgoulet＠torproject.org 04 Aug '17

04 Aug '17

commit 3c3a1a808a738156b65c76b56cd5b98c69806f85 Merge: 2f54670 2810dd4 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Aug 4 14:41:03 2017 -0400 Merge remote-tracking branch 'debian/bugfix/typo-catched'

1 0

[torsocks/master] Fix typo: subsytem → subsystem.
by dgoulet＠torproject.org 04 Aug '17

04 Aug '17

commit c822b5c2cdac0d9f7e0706de488d282bebd2e543 Author: intrigeri <intrigeri(a)boum.org> Date: Wed Oct 19 20:55:26 2016 +0000 Fix typo: subsytem → subsystem. --- src/lib/torsocks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/torsocks.c b/src/lib/torsocks.c index 731b33c..f1be6bc 100644 --- a/src/lib/torsocks.c +++ b/src/lib/torsocks.c @@ -256,7 +256,7 @@ error_dlopen: } /* - * Initialize logging subsytem using either the default values or the one given + * Initialize logging subsystem using either the default values or the one given * by the environment variables. */ static void init_logging(void) @@ -299,7 +299,7 @@ static void init_logging(void) /* After this, it is safe to call any logging macros. */ - DBG("Logging subsytem initialized. Level %d, file %s, time %d", + DBG("Logging subsystem initialized. Level %d, file %s, time %d", level, filepath, t_status); }

1 0

[torsocks/master] Merge remote-tracking branch 'debian/bugfix/typo-conect'
by dgoulet＠torproject.org 04 Aug '17

04 Aug '17

commit 2f54670bb06be303a485d69b9254395e56d281e7 Merge: 3ea5ca1 b072b72 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Aug 4 14:39:54 2017 -0400 Merge remote-tracking branch 'debian/bugfix/typo-conect' src/lib/connect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[torsocks/master] Fix typo: conect → connect.
by dgoulet＠torproject.org 04 Aug '17

04 Aug '17

commit b072b72ca0e4e4598bd7b2a96e6e2a8681a57148 Author: intrigeri <intrigeri(a)boum.org> Date: Wed Oct 19 21:15:51 2016 +0000 Fix typo: conect → connect. --- src/lib/connect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/connect.c b/src/lib/connect.c index 4f18289..7f5657c 100644 --- a/src/lib/connect.c +++ b/src/lib/connect.c @@ -60,7 +60,7 @@ int tsocks_validate_socket(int sockfd, const struct sockaddr *addr) * to allow AF_UNIX/_LOCAL socket to work with torsocks. */ if (addr->sa_family != AF_INET && addr->sa_family != AF_INET6) { - DBG("[conect] Connection is not IPv4/v6. Ignoring."); + DBG("[connect] Connection is not IPv4/v6. Ignoring."); /* Ask the call to use the libc connect. */ goto libc_call; }

1 0

[torsocks/master] Fix typo: catched → caught.
by dgoulet＠torproject.org 04 Aug '17

04 Aug '17

commit 2810dd44bb8928cfffda0c028701b98f84f305b3 Author: intrigeri <intrigeri(a)boum.org> Date: Tue Jan 12 05:22:02 2016 +0000 Fix typo: catched → caught. Spotted by Lintian. --- src/common/compat.h | 2 +- src/lib/close.c | 2 +- src/lib/connect.c | 2 +- src/lib/fclose.c | 2 +- src/lib/sendto.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/compat.h b/src/common/compat.h index ce47129..fbaee3f 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -64,7 +64,7 @@ void tsocks_once(tsocks_once_t *o, void (*init_routine)(void)); /* * Some old system requires kernel headers for those values. If they are not * defined, set them to a bad syscall value. Just to be clear, if the value is - * undefined, tsocks syscall() will DENY the real syscall if catched. + * undefined, tsocks syscall() will DENY the real syscall if caught. * * The values are not the same per syscall here so we don't end up with * duplicates in the switch case in the tsocks sycall wrapper. diff --git a/src/lib/close.c b/src/lib/close.c index 7fb9e53..23c80e6 100644 --- a/src/lib/close.c +++ b/src/lib/close.c @@ -30,7 +30,7 @@ LIBC_CLOSE_RET_TYPE tsocks_close(LIBC_CLOSE_SIG) { struct connection *conn; - DBG("Close catched for fd %d", fd); + DBG("Close caught for fd %d", fd); connection_registry_lock(); conn = connection_find(fd); diff --git a/src/lib/connect.c b/src/lib/connect.c index 2480643..ac51835 100644 --- a/src/lib/connect.c +++ b/src/lib/connect.c @@ -109,7 +109,7 @@ LIBC_CONNECT_RET_TYPE tsocks_connect(LIBC_CONNECT_SIG) struct connection *new_conn; struct onion_entry *on_entry; - DBG("Connect catched on fd %d", sockfd); + DBG("Connect caught on fd %d", sockfd); /* * Validate socket values in order to see if we can handle this connect diff --git a/src/lib/fclose.c b/src/lib/fclose.c index b6f3251..6bb6a2c 100644 --- a/src/lib/fclose.c +++ b/src/lib/fclose.c @@ -42,7 +42,7 @@ LIBC_FCLOSE_RET_TYPE tsocks_fclose(LIBC_FCLOSE_SIG) goto error; } - DBG("[fclose] Close catched for fd %d", fd); + DBG("[fclose] Close caught for fd %d", fd); connection_registry_lock(); conn = connection_find(fd); diff --git a/src/lib/sendto.c b/src/lib/sendto.c index 6b1d3ff..087eb1f 100644 --- a/src/lib/sendto.c +++ b/src/lib/sendto.c @@ -51,7 +51,7 @@ LIBC_SENDTO_RET_TYPE tsocks_sendto(LIBC_SENDTO_SIG) goto libc_sendto; } - DBG("[sendto] TCP fast open catched on fd %d", sockfd); + DBG("[sendto] TCP fast open caught on fd %d", sockfd); ret = connect(sockfd, dest_addr, addrlen); if (ret == 0) {

1 0

[torsocks/master] doc: Add autogen.sh step to README
by dgoulet＠torproject.org 04 Aug '17

04 Aug '17

commit 3ea5ca1f0be0c6f120088db345db67a674ca6590 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Aug 4 14:09:07 2017 -0400 doc: Add autogen.sh step to README Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8ad574f..d67fd51 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,7 @@ Requirements Installation ----------------- + $ ./autogen.sh $ ./configure $ make $ sudo make install

1 0

[tor/master] Fix memory leak of "torrcd" in test_config_include_folder_order()
by nickm＠torproject.org 04 Aug '17

04 Aug '17

commit ce07b4dd918cc3a6043f4fd676ec98492c5137a9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 4 13:50:27 2017 -0400 Fix memory leak of "torrcd" in test_config_include_folder_order() Bugfix on 0265ced02b7a652c5941cb2c14ee1e0de0b1d90e; bug not in any released Tor. --- src/test/test_config.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_config.c b/src/test/test_config.c index 24cb65271..6b875a0a0 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -5163,6 +5163,7 @@ test_config_include_folder_order(void *data) done: config_free_lines(result); + tor_free(torrcd); tor_free(path); tor_free(path2); tor_free(dir);

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 04 Aug '17

04 Aug '17

commit a542104a0719c8b0674fdd6e68631bda9a4c5b27 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 4 17:45:43 2017 +0000 Update translations for https_everywhere_completed --- fr/https-everywhere.dtd | 13 +++++++++++++ fr_CA/https-everywhere.dtd | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd index 855d793c4..27d2ae234 100644 --- a/fr/https-everywhere.dtd +++ b/fr/https-everywhere.dtd @@ -24,9 +24,22 @@ <!ENTITY https-everywhere.menu.showCounter "Afficher le compteur"> <!ENTITY https-everywhere.menu.viewAllRules "Visualiser toutes les règles"> +<!ENTITY https-everywhere.options.importSettings "Importer les paramètres"> +<!ENTITY https-everywhere.options.import "Importer"> +<!ENTITY https-everywhere.options.imported "Vos paramètres ont été importés."> + <!ENTITY https-everywhere.prefs.title "Préférences de HTTPS partout"> <!ENTITY https-everywhere.prefs.enable_all "Tout activer"> <!ENTITY https-everywhere.prefs.disable_all "Tout désactiver"> +<!ENTITY https-everywhere.prefs.export_settings "Exporter les paramètres"> +<!ENTITY https-everywhere.prefs.settings_warning "Avertissement :"> +<!ENTITY https-everywhere.prefs.settings_warning_delete "Certains de vos paramètres HTTPS partout sont sur le point d'être supprimés !"> +<!ENTITY https-everywhere.prefs.settings_warning_explain "Cette extension sera considérablement mise à niveau dans un avenir proche. Si vous n’exportez pas vos paramètres, vous pourriez perdre l'un ou plusieurs des suivants :"> +<!ENTITY https-everywhere.prefs.settings_global "Préférences globales"> +<!ENTITY https-everywhere.prefs.settings_toggle "Paramètre d'activation, de désactivation par site"> +<!ENTITY https-everywhere.prefs.settings_custom "Règles de site personnalisées"> +<!ENTITY https-everywhere.prefs.settings_click_ok "Veuillez cliquer sur 'OK'"> +<!ENTITY https-everywhere.prefs.settings_warning_closing "ci-dessous pour vous assurer que vos paramètres sont enregistrés. Une fois que HTTPS partout aura été mise à niveau, vous devrez importer ces paramètres ultérieurement dans les options de l'extension."> <!ENTITY https-everywhere.prefs.reset_defaults "Revenir aux paramètres par défaut"> <!ENTITY https-everywhere.prefs.search "Recherche"> <!ENTITY https-everywhere.prefs.site "Site"> diff --git a/fr_CA/https-everywhere.dtd b/fr_CA/https-everywhere.dtd index d2257bca8..505c6506d 100644 --- a/fr_CA/https-everywhere.dtd +++ b/fr_CA/https-everywhere.dtd @@ -24,9 +24,22 @@ <!ENTITY https-everywhere.menu.showCounter "Afficher le compteur"> <!ENTITY https-everywhere.menu.viewAllRules "Visualiser toutes les règles"> +<!ENTITY https-everywhere.options.importSettings "Importer les paramètres"> +<!ENTITY https-everywhere.options.import "Importer"> +<!ENTITY https-everywhere.options.imported "Vos paramètres ont été importés."> + <!ENTITY https-everywhere.prefs.title "Préférences de HTTPS partout"> <!ENTITY https-everywhere.prefs.enable_all "Tout activer"> <!ENTITY https-everywhere.prefs.disable_all "Tout désactiver"> +<!ENTITY https-everywhere.prefs.export_settings "Exporter les paramètres"> +<!ENTITY https-everywhere.prefs.settings_warning "Avertissement :"> +<!ENTITY https-everywhere.prefs.settings_warning_delete "Certains de vos paramètres HTTPS partout sont sur le point d'être supprimés!"> +<!ENTITY https-everywhere.prefs.settings_warning_explain "Cette extension sera considérablement mise à niveau dans un avenir proche. Si vous n’exportez pas vos paramètres, vous pourriez perdre l'un ou plusieurs des suivants :"> +<!ENTITY https-everywhere.prefs.settings_global "Préférences globales"> +<!ENTITY https-everywhere.prefs.settings_toggle "Paramètre d'activation, de désactivation par site"> +<!ENTITY https-everywhere.prefs.settings_custom "Règles de site personnalisées"> +<!ENTITY https-everywhere.prefs.settings_click_ok "Veuillez cliquer sur 'OK'"> +<!ENTITY https-everywhere.prefs.settings_warning_closing "ci-dessous pour vous assurer que vos paramètres sont enregistrés. Une fois que HTTPS partout aura été mise à niveau, vous devrez importer ces paramètres ultérieurement dans les options de l'extension."> <!ENTITY https-everywhere.prefs.reset_defaults "Revenir aux paramètres par défaut"> <!ENTITY https-everywhere.prefs.search "Recherche"> <!ENTITY https-everywhere.prefs.site "Site">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 04 Aug '17

04 Aug '17

commit 00124a5caf22b224c85fe659f5c633969bea4ace Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 4 17:45:33 2017 +0000 Update translations for https_everywhere --- fr/https-everywhere.dtd | 24 ++++++++++++------------ fr_CA/https-everywhere.dtd | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd index f4fad3816..27d2ae234 100644 --- a/fr/https-everywhere.dtd +++ b/fr/https-everywhere.dtd @@ -24,22 +24,22 @@ <!ENTITY https-everywhere.menu.showCounter "Afficher le compteur"> <!ENTITY https-everywhere.menu.viewAllRules "Visualiser toutes les règles"> -<!ENTITY https-everywhere.options.importSettings "Import Settings"> -<!ENTITY https-everywhere.options.import "Import"> -<!ENTITY https-everywhere.options.imported "Your settings have been imported."> +<!ENTITY https-everywhere.options.importSettings "Importer les paramètres"> +<!ENTITY https-everywhere.options.import "Importer"> +<!ENTITY https-everywhere.options.imported "Vos paramètres ont été importés."> <!ENTITY https-everywhere.prefs.title "Préférences de HTTPS partout"> <!ENTITY https-everywhere.prefs.enable_all "Tout activer"> <!ENTITY https-everywhere.prefs.disable_all "Tout désactiver"> -<!ENTITY https-everywhere.prefs.export_settings "Export Settings"> -<!ENTITY https-everywhere.prefs.settings_warning "Warning:"> -<!ENTITY https-everywhere.prefs.settings_warning_delete "Some of your HTTPS Everywhere settings are about to be deleted!"> -<!ENTITY https-everywhere.prefs.settings_warning_explain "This extension will be upgraded substantially in the near future. If you do not export your settings, you could lose one or more of the following:"> -<!ENTITY https-everywhere.prefs.settings_global "Global preferences"> -<!ENTITY https-everywhere.prefs.settings_toggle "Per-site on/off setting"> -<!ENTITY https-everywhere.prefs.settings_custom "Custom site rules"> -<!ENTITY https-everywhere.prefs.settings_click_ok "Please click 'OK'"> -<!ENTITY https-everywhere.prefs.settings_warning_closing "below to ensure your settings are saved. Once HTTPS Everywhere is upgraded, you will later have to import these settings in the extension options section."> +<!ENTITY https-everywhere.prefs.export_settings "Exporter les paramètres"> +<!ENTITY https-everywhere.prefs.settings_warning "Avertissement :"> +<!ENTITY https-everywhere.prefs.settings_warning_delete "Certains de vos paramètres HTTPS partout sont sur le point d'être supprimés !"> +<!ENTITY https-everywhere.prefs.settings_warning_explain "Cette extension sera considérablement mise à niveau dans un avenir proche. Si vous n’exportez pas vos paramètres, vous pourriez perdre l'un ou plusieurs des suivants :"> +<!ENTITY https-everywhere.prefs.settings_global "Préférences globales"> +<!ENTITY https-everywhere.prefs.settings_toggle "Paramètre d'activation, de désactivation par site"> +<!ENTITY https-everywhere.prefs.settings_custom "Règles de site personnalisées"> +<!ENTITY https-everywhere.prefs.settings_click_ok "Veuillez cliquer sur 'OK'"> +<!ENTITY https-everywhere.prefs.settings_warning_closing "ci-dessous pour vous assurer que vos paramètres sont enregistrés. Une fois que HTTPS partout aura été mise à niveau, vous devrez importer ces paramètres ultérieurement dans les options de l'extension."> <!ENTITY https-everywhere.prefs.reset_defaults "Revenir aux paramètres par défaut"> <!ENTITY https-everywhere.prefs.search "Recherche"> <!ENTITY https-everywhere.prefs.site "Site"> diff --git a/fr_CA/https-everywhere.dtd b/fr_CA/https-everywhere.dtd index 3739d511b..505c6506d 100644 --- a/fr_CA/https-everywhere.dtd +++ b/fr_CA/https-everywhere.dtd @@ -24,22 +24,22 @@ <!ENTITY https-everywhere.menu.showCounter "Afficher le compteur"> <!ENTITY https-everywhere.menu.viewAllRules "Visualiser toutes les règles"> -<!ENTITY https-everywhere.options.importSettings "Import Settings"> -<!ENTITY https-everywhere.options.import "Import"> -<!ENTITY https-everywhere.options.imported "Your settings have been imported."> +<!ENTITY https-everywhere.options.importSettings "Importer les paramètres"> +<!ENTITY https-everywhere.options.import "Importer"> +<!ENTITY https-everywhere.options.imported "Vos paramètres ont été importés."> <!ENTITY https-everywhere.prefs.title "Préférences de HTTPS partout"> <!ENTITY https-everywhere.prefs.enable_all "Tout activer"> <!ENTITY https-everywhere.prefs.disable_all "Tout désactiver"> -<!ENTITY https-everywhere.prefs.export_settings "Export Settings"> -<!ENTITY https-everywhere.prefs.settings_warning "Warning:"> -<!ENTITY https-everywhere.prefs.settings_warning_delete "Some of your HTTPS Everywhere settings are about to be deleted!"> -<!ENTITY https-everywhere.prefs.settings_warning_explain "This extension will be upgraded substantially in the near future. If you do not export your settings, you could lose one or more of the following:"> -<!ENTITY https-everywhere.prefs.settings_global "Global preferences"> -<!ENTITY https-everywhere.prefs.settings_toggle "Per-site on/off setting"> -<!ENTITY https-everywhere.prefs.settings_custom "Custom site rules"> -<!ENTITY https-everywhere.prefs.settings_click_ok "Please click 'OK'"> -<!ENTITY https-everywhere.prefs.settings_warning_closing "below to ensure your settings are saved. Once HTTPS Everywhere is upgraded, you will later have to import these settings in the extension options section."> +<!ENTITY https-everywhere.prefs.export_settings "Exporter les paramètres"> +<!ENTITY https-everywhere.prefs.settings_warning "Avertissement :"> +<!ENTITY https-everywhere.prefs.settings_warning_delete "Certains de vos paramètres HTTPS partout sont sur le point d'être supprimés!"> +<!ENTITY https-everywhere.prefs.settings_warning_explain "Cette extension sera considérablement mise à niveau dans un avenir proche. Si vous n’exportez pas vos paramètres, vous pourriez perdre l'un ou plusieurs des suivants :"> +<!ENTITY https-everywhere.prefs.settings_global "Préférences globales"> +<!ENTITY https-everywhere.prefs.settings_toggle "Paramètre d'activation, de désactivation par site"> +<!ENTITY https-everywhere.prefs.settings_custom "Règles de site personnalisées"> +<!ENTITY https-everywhere.prefs.settings_click_ok "Veuillez cliquer sur 'OK'"> +<!ENTITY https-everywhere.prefs.settings_warning_closing "ci-dessous pour vous assurer que vos paramètres sont enregistrés. Une fois que HTTPS partout aura été mise à niveau, vous devrez importer ces paramètres ultérieurement dans les options de l'extension."> <!ENTITY https-everywhere.prefs.reset_defaults "Revenir aux paramètres par défaut"> <!ENTITY https-everywhere.prefs.search "Recherche"> <!ENTITY https-everywhere.prefs.site "Site">

1 0