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

[tor/master] Merge branch 'tor-github/pr/1002'
by asn＠torproject.org 15 May '19

15 May '19

commit 338cfb31798267dc8260415ef55ddceb042367bd Merge: 39a14421b 3c2648bbd Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed May 15 23:23:18 2019 +0300 Merge branch 'tor-github/pr/1002' changes/ticket30414 | 3 + src/app/main/shutdown.c | 15 -- src/app/main/subsystem_list.c | 7 +- src/core/include.am | 8 + src/core/mainloop/mainloop.c | 288 ---------------------------------- src/core/mainloop/mainloop.h | 1 - src/core/or/circuitstats.c | 2 + src/core/or/or_periodic.c | 65 ++++++++ src/core/or/or_periodic.h | 17 ++ src/core/or/or_sys.c | 43 ++++++ src/core/or/or_sys.h | 17 ++ src/feature/relay/relay_periodic.c | 308 +++++++++++++++++++++++++++++++++++++ src/feature/relay/relay_periodic.h | 18 +++ src/feature/relay/relay_sys.c | 48 ++++++ src/feature/relay/relay_sys.h | 17 ++ src/feature/relay/selftest.c | 1 + 16 files changed, 553 insertions(+), 305 deletions(-)

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 15 May '19

15 May '19

commit f3cb98cd3ad4835db90f157989cb46c8dc23cbb5 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 15 19:51:01 2019 +0000 Update translations for support-portal_completed --- contents+fr.po | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index f94e2a984..c0a9598b7 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -5113,16 +5113,16 @@ msgid "" "obfs3, and also prevents censors from finding bridges by Internet scanning. " "Obfs4 bridges are less likely to be blocked than obfs3 [bridges](#bridge)." msgstr "" -"Obfs4 est un [transport enfichable](#pluggable-transports) qui rend " -"[Tor](#tor-/-tor-tor-network/-core-tor)[trafic](#traffic) aléatoire comme " -"obfs3, et empêche aussi les censeurs de trouver des ponts par balayage " -"Internet. Les ponts Obfs4 sont moins susceptibles d’être bloqués que les " -"[ponts](#bridge) obfs3." +"Obfs4 est un [transport enfichable](#pluggable-transports) qui donne à " +"[Tor](#tor-/-tor-tor-network/-core-tor)[trafic](#traffic) une apparence " +"aléatoire, comme obfs3, et empêche aussi les censeurs de trouver des ponts " +"en balayant Internet. Les ponts obfs4 sont moins susceptibles d’être bloqués" +" que les [ponts](#bridge) obfs3." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### onion address" -msgstr "### addresse onion" +msgstr "### adresse onion" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5130,8 +5130,8 @@ msgid "" "A standardized internet domain name used by onion services that ends in " ".onion and is designed to be [self-authenticating](#self-authenticating)." msgstr "" -"Un domaine internet standardisé utilisé par les services onion qui finissent" -" par .onion et est conçu pour être [auto-authentifiable](#self-" +"Un nom de domaine Internet normalisé utilisé par les services onion, qui se " +"termine par .onion et conçu pour être [autoauthentifiable](#self-" "authenticating)." #: https//support.torproject.org/misc/glossary/ @@ -5146,15 +5146,15 @@ msgid "" " observation network for detecting [censorship](#network-censorship), " "surveillance and [traffic](#traffic) manipulation on the internet." msgstr "" -"OONI signifie \"Observatoire ouvert des interférences réseau\", il s’agit du" -" réseau global d’observation pour détecter la [censure](#network-" -"censorship), la surveillance et la manipulation de [traffic](#traffic) sur " -"internet." +"OONI signifie « Observatoire ouvert des interférences réseau ». C’est un " +"réseau mondial d’observation afin de détecter la [censure](#network-" +"censorship), la surveillance et la manipulation du [trafic](#traffic) sur " +"Internet." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Onion Browser" -msgstr "### Onion Browser" +msgstr "### Navigateur Onion" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 15 May '19

15 May '19

commit 117a7b34803a0b9a861deb449941fa9abb1496a0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 15 19:50:54 2019 +0000 Update translations for support-portal --- contents+fr.po | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index f94e2a984..c0a9598b7 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -5113,16 +5113,16 @@ msgid "" "obfs3, and also prevents censors from finding bridges by Internet scanning. " "Obfs4 bridges are less likely to be blocked than obfs3 [bridges](#bridge)." msgstr "" -"Obfs4 est un [transport enfichable](#pluggable-transports) qui rend " -"[Tor](#tor-/-tor-tor-network/-core-tor)[trafic](#traffic) aléatoire comme " -"obfs3, et empêche aussi les censeurs de trouver des ponts par balayage " -"Internet. Les ponts Obfs4 sont moins susceptibles d’être bloqués que les " -"[ponts](#bridge) obfs3." +"Obfs4 est un [transport enfichable](#pluggable-transports) qui donne à " +"[Tor](#tor-/-tor-tor-network/-core-tor)[trafic](#traffic) une apparence " +"aléatoire, comme obfs3, et empêche aussi les censeurs de trouver des ponts " +"en balayant Internet. Les ponts obfs4 sont moins susceptibles d’être bloqués" +" que les [ponts](#bridge) obfs3." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### onion address" -msgstr "### addresse onion" +msgstr "### adresse onion" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -5130,8 +5130,8 @@ msgid "" "A standardized internet domain name used by onion services that ends in " ".onion and is designed to be [self-authenticating](#self-authenticating)." msgstr "" -"Un domaine internet standardisé utilisé par les services onion qui finissent" -" par .onion et est conçu pour être [auto-authentifiable](#self-" +"Un nom de domaine Internet normalisé utilisé par les services onion, qui se " +"termine par .onion et conçu pour être [autoauthentifiable](#self-" "authenticating)." #: https//support.torproject.org/misc/glossary/ @@ -5146,15 +5146,15 @@ msgid "" " observation network for detecting [censorship](#network-censorship), " "surveillance and [traffic](#traffic) manipulation on the internet." msgstr "" -"OONI signifie \"Observatoire ouvert des interférences réseau\", il s’agit du" -" réseau global d’observation pour détecter la [censure](#network-" -"censorship), la surveillance et la manipulation de [traffic](#traffic) sur " -"internet." +"OONI signifie « Observatoire ouvert des interférences réseau ». C’est un " +"réseau mondial d’observation afin de détecter la [censure](#network-" +"censorship), la surveillance et la manipulation du [trafic](#traffic) sur " +"Internet." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Onion Browser" -msgstr "### Onion Browser" +msgstr "### Navigateur Onion" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description)

1 0

[translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed
by translation＠torproject.org 15 May '19

15 May '19

commit 87d40b87d4d47e4943aa6232eabd3259c99e2a5f Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 15 19:48:02 2019 +0000 Update translations for tbmanual-contentspot_completed --- contents+fr.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 4b7bdc8f5..75a35a281 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -658,10 +658,10 @@ msgid "" "any other protocol. While still included by default, it is reccomended to " "use obfs4 instead, as it has several security improvements over obfs3." msgstr "" -"obfs3 donne l’impression que le trafic de Tor est aléatoire afin qu’il ne " -"ressemble ni à Tor ni à n’importe quel autre protocole. Bien qu’il soit " -"encore inclus par défaut, il est plutôt recommandé d’utiliser obfs4, car il " -"comporte plusieurs améliorations de sécurité par rapport à obfs3." +"obfs3 donne à Tor une apparence aléatoire, de sorte qu’il ne ressemble ni à " +"Tor ni à aucun autre protocole. Bien qu’il soit encore inclus par défaut, il" +" est plutôt recommandé d’utiliser obfs4, car il comporte plusieurs " +"améliorations de sécurité par rapport à obfs3." #: https//tb-manual.torproject.org/en-US/transports/ #: (content/transports/contents+en-US.lrtopic.body) @@ -685,9 +685,9 @@ msgid "" "from finding bridges by Internet scanning. obfs4 bridges are less likely to " "be blocked than obfs3 bridges." msgstr "" -"obfs4 donne l’impression que le trafic Tor est aléatoire, comme obfs3, et " -"empêche aussi les censeurs de trouver des ponts en balayant l’Internet. Les " -"ponts obfs4 sont moins susceptibles d’être bloqués que les ponts obfs3." +"obfs4 donne à Tor une apparence aléatoire, comme obfs3, et empêche aussi les" +" censeurs de trouver des ponts en balayant Internet. Les ponts obfs4 sont " +"moins susceptibles d’être bloqués que les ponts obfs3." #: https//tb-manual.torproject.org/en-US/transports/ #: (content/transports/contents+en-US.lrtopic.body)

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 15 May '19

15 May '19

commit 2f22b45b29338d3b0424399f6bcbf8daf2fb997c Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 15 19:47:53 2019 +0000 Update translations for tbmanual-contentspot --- contents+fr.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 4b7bdc8f5..75a35a281 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -658,10 +658,10 @@ msgid "" "any other protocol. While still included by default, it is reccomended to " "use obfs4 instead, as it has several security improvements over obfs3." msgstr "" -"obfs3 donne l’impression que le trafic de Tor est aléatoire afin qu’il ne " -"ressemble ni à Tor ni à n’importe quel autre protocole. Bien qu’il soit " -"encore inclus par défaut, il est plutôt recommandé d’utiliser obfs4, car il " -"comporte plusieurs améliorations de sécurité par rapport à obfs3." +"obfs3 donne à Tor une apparence aléatoire, de sorte qu’il ne ressemble ni à " +"Tor ni à aucun autre protocole. Bien qu’il soit encore inclus par défaut, il" +" est plutôt recommandé d’utiliser obfs4, car il comporte plusieurs " +"améliorations de sécurité par rapport à obfs3." #: https//tb-manual.torproject.org/en-US/transports/ #: (content/transports/contents+en-US.lrtopic.body) @@ -685,9 +685,9 @@ msgid "" "from finding bridges by Internet scanning. obfs4 bridges are less likely to " "be blocked than obfs3 bridges." msgstr "" -"obfs4 donne l’impression que le trafic Tor est aléatoire, comme obfs3, et " -"empêche aussi les censeurs de trouver des ponts en balayant l’Internet. Les " -"ponts obfs4 sont moins susceptibles d’être bloqués que les ponts obfs3." +"obfs4 donne à Tor une apparence aléatoire, comme obfs3, et empêche aussi les" +" censeurs de trouver des ponts en balayant Internet. Les ponts obfs4 sont " +"moins susceptibles d’être bloqués que les ponts obfs3." #: https//tb-manual.torproject.org/en-US/transports/ #: (content/transports/contents+en-US.lrtopic.body)

1 0

[tor/master] Add a --list-modules command
by dgoulet＠torproject.org 15 May '19

15 May '19

commit 1b16fcb70cb9507184fe7316396c93c1daa12674 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 9 11:26:13 2019 -0400 Add a --list-modules command Closes ticket 30452. --- changes/bug30452 | 3 +++ doc/tor.1.txt | 4 ++++ src/app/config/config.c | 13 +++++++++++++ src/feature/dirauth/authmode.h | 4 ++++ 4 files changed, 24 insertions(+) diff --git a/changes/bug30452 b/changes/bug30452 new file mode 100644 index 000000000..2bb401d87 --- /dev/null +++ b/changes/bug30452 @@ -0,0 +1,3 @@ + o Minor features (compile-time modules): + - Add a --list-modules command to print a list of which compile-time + modules are enabled. Closes ticket 30452. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 975a19818..f46929897 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -88,6 +88,10 @@ COMMAND-LINE OPTIONS List all valid options that are scheduled to become obsolete in a future version. (This is a warning, not a promise.) +[[opt-list-modules]] **--list-modules**:: + For each optional module, list whether or not it has been compiled + into Tor. (Any module not listed is not optional in this version of Tor.) + [[opt-version]] **--version**:: Display Tor version and exit. diff --git a/src/app/config/config.c b/src/app/config/config.c index 2a504d306..7ccd76e7f 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -2474,6 +2474,7 @@ static const struct { { "--quiet", TAKES_NO_ARGUMENT }, { "--hush", TAKES_NO_ARGUMENT }, { "--version", TAKES_NO_ARGUMENT }, + { "--list-modules", TAKES_NO_ARGUMENT }, { "--library-versions", TAKES_NO_ARGUMENT }, { "-h", TAKES_NO_ARGUMENT }, { "--help", TAKES_NO_ARGUMENT }, @@ -2695,6 +2696,13 @@ list_deprecated_options(void) } } +/** Print all compile-time modules and their enabled/disabled status. */ +static void +list_enabled_modules(void) +{ + printf("%s: %s\n", "dirauth", have_module_dirauth() ? "yes" : "no"); +} + /** Last value actually set by resolve_my_address. */ static uint32_t last_resolved_addr = 0; @@ -5198,6 +5206,11 @@ options_init_from_torrc(int argc, char **argv) return 1; } + if (config_line_find(cmdline_only_options, "--list-modules")) { + list_enabled_modules(); + return 1; + } + if (config_line_find(cmdline_only_options, "--library-versions")) { printf("Tor version %s. \n", get_version()); printf("Library versions\tCompiled\t\tRuntime\n"); diff --git a/src/feature/dirauth/authmode.h b/src/feature/dirauth/authmode.h index 40a89c739..876a1f947 100644 --- a/src/feature/dirauth/authmode.h +++ b/src/feature/dirauth/authmode.h @@ -27,6 +27,8 @@ authdir_mode_v3(const or_options_t *options) return authdir_mode(options) && options->V3AuthoritativeDir != 0; } +#define have_module_dirauth() (1) + #else /* HAVE_MODULE_DIRAUTH */ #define authdir_mode(options) (((void)(options)),0) @@ -37,6 +39,8 @@ authdir_mode_v3(const or_options_t *options) #define authdir_mode_bridge(options) (((void)(options)),0) #define authdir_mode_v3(options) (((void)(options)),0) +#define have_module_dirauth() (0) + #endif /* HAVE_MODULE_DIRAUTH */ #endif /* TOR_MODE_H */

1 0

[tor/master] Merge branch 'ticket30452_035_v3' into ticket30452_041_v3
by dgoulet＠torproject.org 15 May '19

15 May '19

commit 1c95bdb83b1bbbde51b21e30aaed16b406ed7ec5 Merge: 43d411945 1b16fcb70 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 14 19:20:53 2019 -0400 Merge branch 'ticket30452_035_v3' into ticket30452_041_v3 changes/bug30452 | 3 +++ doc/tor.1.txt | 4 ++++ src/app/config/config.c | 13 +++++++++++++ src/feature/dirauth/authmode.h | 4 ++++ 4 files changed, 24 insertions(+) diff --cc doc/tor.1.txt index 8cb85fc35,f46929897..4bd365c77 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@@ -88,10 -88,12 +88,14 @@@ COMMAND-LINE OPTION List all valid options that are scheduled to become obsolete in a future version. (This is a warning, not a promise.) + [[opt-list-modules]] **--list-modules**:: + For each optional module, list whether or not it has been compiled + into Tor. (Any module not listed is not optional in this version of Tor.) + [[opt-version]] **--version**:: - Display Tor version and exit. + Display Tor version and exit. The output is a single line of the format + "Tor version [version number]." (The version number format + is as specified in version-spec.txt.) [[opt-quiet]] **--quiet**|**--hush**:: Override the default console log. By default, Tor starts out logging

1 0

[tor/master] Update practracker for 30452
by dgoulet＠torproject.org 15 May '19

15 May '19

commit dd537ba35fbb22efb8c6ed0d6b623269531d7900 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 14 19:22:35 2019 -0400 Update practracker for 30452 --- scripts/maint/practracker/exceptions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 24452b615..2e272dc01 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -29,13 +29,13 @@ # # Remember: It is better to fix the problem than to add a new exception! -problem file-size /src/app/config/config.c 8510 +problem file-size /src/app/config/config.c 8520 problem include-count /src/app/config/config.c 88 problem function-size /src/app/config/config.c:options_act_reversible() 296 problem function-size /src/app/config/config.c:options_act() 588 problem function-size /src/app/config/config.c:resolve_my_address() 192 problem function-size /src/app/config/config.c:options_validate() 1220 -problem function-size /src/app/config/config.c:options_init_from_torrc() 202 +problem function-size /src/app/config/config.c:options_init_from_torrc() 210 problem function-size /src/app/config/config.c:options_init_from_string() 173 problem function-size /src/app/config/config.c:options_init_logs() 146 problem function-size /src/app/config/config.c:parse_bridge_line() 104

1 0

[tor/master] Merge branch 'ticket30452_035_v3' into ticket30452_041_v3
by dgoulet＠torproject.org 15 May '19

15 May '19

commit 370ea8d23b05fbf725f1474ed734233c3a7197e4 Merge: dd537ba35 0c451b31d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 14 19:55:51 2019 -0400 Merge branch 'ticket30452_035_v3' into ticket30452_041_v3 src/app/main/main.c | 1 + 1 file changed, 1 insertion(+)

1 0

[tor/master] Make --list-modules imply --hush
by dgoulet＠torproject.org 15 May '19

15 May '19

commit 0c451b31d2694c96ec20145e3b0e9b22cd54819d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 14 19:55:35 2019 -0400 Make --list-modules imply --hush --- src/app/main/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/main/main.c b/src/app/main/main.c index c45c87d8d..67f2181cd 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -577,6 +577,7 @@ tor_init(int argc, char *argv[]) if (!strcmp(cl->key, "--version") || !strcmp(cl->key, "--digests") || !strcmp(cl->key, "--list-torrc-options") || !strcmp(cl->key, "--library-versions") || + !strcmp(cl->key, "--list-modules") || !strcmp(cl->key, "--hash-password") || !strcmp(cl->key, "-h") || !strcmp(cl->key, "--help")) { if (quiet < 1)

1 0