July 2018 - tor-commits - lists.torproject.org

[tor/maint-0.2.9] Merge branch 'bug26485_029_squashed' into maint-0.2.9
by nickm＠torproject.org 18 Jul '18

18 Jul '18

commit a321d72401348cc3c8a5c3e86b2506c5c2278acd Merge: 6dafddd05 fd5dce0a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 18 15:01:03 2018 -0400 Merge branch 'bug26485_029_squashed' into maint-0.2.9 changes/bug26485 | 4 ++++ src/or/config.c | 9 ++++++++- src/or/dirserv.c | 43 +++++++++++++++++++++++++++++++++++++------ src/or/dirserv.h | 3 +-- src/or/dirvote.c | 9 ++++++++- src/test/test_dir.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 6 files changed, 110 insertions(+), 11 deletions(-)

1 0

[tor/maint-0.2.9] Warn the directory authority operator if their versions list is bogus
by nickm＠torproject.org 18 Jul '18

18 Jul '18

commit dcee4d4c9cc7d98e5ae8e913c73a3afc41753c64 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 11 11:14:48 2018 -0400 Warn the directory authority operator if their versions list is bogus Prevents bug 26485; bugfix on 0.1.1.6-alpha. --- changes/bug26485 | 4 ++++ src/or/config.c | 9 ++++++++- src/or/dirserv.c | 43 +++++++++++++++++++++++++++++++++++++------ src/or/dirserv.h | 3 +-- 4 files changed, 50 insertions(+), 9 deletions(-) diff --git a/changes/bug26485 b/changes/bug26485 new file mode 100644 index 000000000..5a40b7a78 --- /dev/null +++ b/changes/bug26485 @@ -0,0 +1,4 @@ + o Minor bugfixes (directory authority): + - When voting for recommended versions, make sure that all of the + versions are well-formed and parsable. Fixes bug 26485; bugfix on + 0.1.1.6-alpha. diff --git a/src/or/config.c b/src/or/config.c index 75e406585..810f1e9a7 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3098,6 +3098,14 @@ options_validate(or_options_t *old_options, or_options_t *options, !options->RecommendedServerVersions)) REJECT("Versioning authoritative dir servers must set " "Recommended*Versions."); + + char *t; + /* Call these functions to produce warnings only. */ + t = format_recommended_version_list(options->RecommendedClientVersions, 1); + tor_free(t); + t = format_recommended_version_list(options->RecommendedServerVersions, 1); + tor_free(t); + if (options->UseEntryGuards) { log_info(LD_CONFIG, "Authoritative directory servers can't set " "UseEntryGuards. Disabling."); @@ -8003,4 +8011,3 @@ init_cookie_authentication(const char *fname, const char *header, tor_free(cookie_file_str); return retval; } - diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 94290d5dd..177009208 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -72,7 +72,6 @@ static int routers_with_measured_bw = 0; static void directory_remove_invalid(void); -static char *format_versions_list(config_line_t *ln); struct authdir_config_t; static uint32_t dirserv_get_status_impl(const char *fp, const char *nickname, @@ -1032,8 +1031,8 @@ list_server_status_v1(smartlist_t *routers, char **router_status_out, * allocate and return a new string containing the version numbers, in order, * separated by commas. Used to generate Recommended(Client|Server)?Versions */ -static char * -format_versions_list(config_line_t *ln) +char * +format_recommended_version_list(const config_line_t *ln, int warn) { smartlist_t *versions; char *result; @@ -1042,6 +1041,37 @@ format_versions_list(config_line_t *ln) smartlist_split_string(versions, ln->value, ",", SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); } + + /* Handle the case where a dirauth operator has accidentally made some + * versions space-separated instead of comma-separated. */ + smartlist_t *more_versions = smartlist_new(); + SMARTLIST_FOREACH_BEGIN(versions, char *, v) { + if (strchr(v, ' ')) { + if (warn) + log_warn(LD_DIRSERV, "Unexpected space in versions list member %s. " + "(These are supposed to be comma-separated; I'll pretend you " + "used commas instead.)", escaped(v)); + SMARTLIST_DEL_CURRENT(versions, v); + smartlist_split_string(more_versions, v, NULL, + SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); + tor_free(v); + } + } SMARTLIST_FOREACH_END(v); + smartlist_add_all(versions, more_versions); + smartlist_free(more_versions); + + /* Check to make sure everything looks like a version. */ + if (warn) { + SMARTLIST_FOREACH_BEGIN(versions, const char *, v) { + tor_version_t ver; + if (tor_version_parse(v, &ver) < 0) { + log_warn(LD_DIRSERV, "Recommended version %s does not look valid. " + " (I'll include it anyway, since you told me to.)", + escaped(v)); + } + } SMARTLIST_FOREACH_END(v); + } + sort_version_list(versions, 1); result = smartlist_join_strings(versions,",",0,NULL); SMARTLIST_FOREACH(versions,char *,s,tor_free(s)); @@ -2860,8 +2890,10 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, } if (options->VersioningAuthoritativeDir) { - client_versions = format_versions_list(options->RecommendedClientVersions); - server_versions = format_versions_list(options->RecommendedServerVersions); + client_versions = + format_recommended_version_list(options->RecommendedClientVersions, 0); + server_versions = + format_recommended_version_list(options->RecommendedServerVersions, 0); } contact = get_options()->ContactInfo; @@ -3879,4 +3911,3 @@ dirserv_free_all(void) dirserv_clear_measured_bw_cache(); } - diff --git a/src/or/dirserv.h b/src/or/dirserv.h index 1e4f27e3d..624cd7e0b 100644 --- a/src/or/dirserv.h +++ b/src/or/dirserv.h @@ -104,7 +104,7 @@ char *routerstatus_format_entry( void dirserv_free_all(void); void cached_dir_decref(cached_dir_t *d); cached_dir_t *new_cached_dir(char *s, time_t published); - +char *format_recommended_version_list(const config_line_t *line, int warn); int validate_recommended_package_line(const char *line); #ifdef DIRSERV_PRIVATE @@ -141,4 +141,3 @@ int dirserv_read_guardfraction_file(const char *fname, smartlist_t *vote_routerstatuses); #endif -

1 0

[tor/maint-0.2.9] Warn when an authority has voted for a version with a space in it.
by nickm＠torproject.org 18 Jul '18

18 Jul '18

commit 8ee1fe7aa76e0d5cb8704e397aa4cd81c875f1a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 11 11:24:55 2018 -0400 Warn when an authority has voted for a version with a space in it. Another way to try to prevent a recurrence of 26485. --- src/or/dirvote.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 738ab35bc..e6a745612 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -673,6 +673,14 @@ compute_consensus_versions_list(smartlist_t *lst, int n_versioning) int min = n_versioning / 2; smartlist_t *good = smartlist_new(); char *result; + SMARTLIST_FOREACH_BEGIN(lst, const char *, v) { + if (strchr(v, ' ')) { + log_warn(LD_DIR, "At least one authority has voted for a version %s " + "that contains a space. This probably wasn't intentional, and " + "is likely to cause trouble. Please tell them to stop it.", + escaped(v)); + } + } SMARTLIST_FOREACH_END(v); sort_version_list(lst, 0); get_frequent_members(good, lst, min); result = smartlist_join_strings(good, ",", 0, NULL); @@ -4002,4 +4010,3 @@ vote_routerstatus_find_microdesc_hash(char *digest256_out, } return -1; } -

1 0

[tor/maint-0.3.2] Warn the directory authority operator if their versions list is bogus
by nickm＠torproject.org 18 Jul '18

18 Jul '18

commit dcee4d4c9cc7d98e5ae8e913c73a3afc41753c64 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 11 11:14:48 2018 -0400 Warn the directory authority operator if their versions list is bogus Prevents bug 26485; bugfix on 0.1.1.6-alpha. --- changes/bug26485 | 4 ++++ src/or/config.c | 9 ++++++++- src/or/dirserv.c | 43 +++++++++++++++++++++++++++++++++++++------ src/or/dirserv.h | 3 +-- 4 files changed, 50 insertions(+), 9 deletions(-) diff --git a/changes/bug26485 b/changes/bug26485 new file mode 100644 index 000000000..5a40b7a78 --- /dev/null +++ b/changes/bug26485 @@ -0,0 +1,4 @@ + o Minor bugfixes (directory authority): + - When voting for recommended versions, make sure that all of the + versions are well-formed and parsable. Fixes bug 26485; bugfix on + 0.1.1.6-alpha. diff --git a/src/or/config.c b/src/or/config.c index 75e406585..810f1e9a7 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3098,6 +3098,14 @@ options_validate(or_options_t *old_options, or_options_t *options, !options->RecommendedServerVersions)) REJECT("Versioning authoritative dir servers must set " "Recommended*Versions."); + + char *t; + /* Call these functions to produce warnings only. */ + t = format_recommended_version_list(options->RecommendedClientVersions, 1); + tor_free(t); + t = format_recommended_version_list(options->RecommendedServerVersions, 1); + tor_free(t); + if (options->UseEntryGuards) { log_info(LD_CONFIG, "Authoritative directory servers can't set " "UseEntryGuards. Disabling."); @@ -8003,4 +8011,3 @@ init_cookie_authentication(const char *fname, const char *header, tor_free(cookie_file_str); return retval; } - diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 94290d5dd..177009208 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -72,7 +72,6 @@ static int routers_with_measured_bw = 0; static void directory_remove_invalid(void); -static char *format_versions_list(config_line_t *ln); struct authdir_config_t; static uint32_t dirserv_get_status_impl(const char *fp, const char *nickname, @@ -1032,8 +1031,8 @@ list_server_status_v1(smartlist_t *routers, char **router_status_out, * allocate and return a new string containing the version numbers, in order, * separated by commas. Used to generate Recommended(Client|Server)?Versions */ -static char * -format_versions_list(config_line_t *ln) +char * +format_recommended_version_list(const config_line_t *ln, int warn) { smartlist_t *versions; char *result; @@ -1042,6 +1041,37 @@ format_versions_list(config_line_t *ln) smartlist_split_string(versions, ln->value, ",", SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); } + + /* Handle the case where a dirauth operator has accidentally made some + * versions space-separated instead of comma-separated. */ + smartlist_t *more_versions = smartlist_new(); + SMARTLIST_FOREACH_BEGIN(versions, char *, v) { + if (strchr(v, ' ')) { + if (warn) + log_warn(LD_DIRSERV, "Unexpected space in versions list member %s. " + "(These are supposed to be comma-separated; I'll pretend you " + "used commas instead.)", escaped(v)); + SMARTLIST_DEL_CURRENT(versions, v); + smartlist_split_string(more_versions, v, NULL, + SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); + tor_free(v); + } + } SMARTLIST_FOREACH_END(v); + smartlist_add_all(versions, more_versions); + smartlist_free(more_versions); + + /* Check to make sure everything looks like a version. */ + if (warn) { + SMARTLIST_FOREACH_BEGIN(versions, const char *, v) { + tor_version_t ver; + if (tor_version_parse(v, &ver) < 0) { + log_warn(LD_DIRSERV, "Recommended version %s does not look valid. " + " (I'll include it anyway, since you told me to.)", + escaped(v)); + } + } SMARTLIST_FOREACH_END(v); + } + sort_version_list(versions, 1); result = smartlist_join_strings(versions,",",0,NULL); SMARTLIST_FOREACH(versions,char *,s,tor_free(s)); @@ -2860,8 +2890,10 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, } if (options->VersioningAuthoritativeDir) { - client_versions = format_versions_list(options->RecommendedClientVersions); - server_versions = format_versions_list(options->RecommendedServerVersions); + client_versions = + format_recommended_version_list(options->RecommendedClientVersions, 0); + server_versions = + format_recommended_version_list(options->RecommendedServerVersions, 0); } contact = get_options()->ContactInfo; @@ -3879,4 +3911,3 @@ dirserv_free_all(void) dirserv_clear_measured_bw_cache(); } - diff --git a/src/or/dirserv.h b/src/or/dirserv.h index 1e4f27e3d..624cd7e0b 100644 --- a/src/or/dirserv.h +++ b/src/or/dirserv.h @@ -104,7 +104,7 @@ char *routerstatus_format_entry( void dirserv_free_all(void); void cached_dir_decref(cached_dir_t *d); cached_dir_t *new_cached_dir(char *s, time_t published); - +char *format_recommended_version_list(const config_line_t *line, int warn); int validate_recommended_package_line(const char *line); #ifdef DIRSERV_PRIVATE @@ -141,4 +141,3 @@ int dirserv_read_guardfraction_file(const char *fname, smartlist_t *vote_routerstatuses); #endif -

1 0

[tor/maint-0.2.9] Add a test for format_recommended_version_list.
by nickm＠torproject.org 18 Jul '18

18 Jul '18

commit fd5dce0a1b84fbf2efe2e77bd999eba23a81c61e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 17 15:39:31 2018 -0400 Add a test for format_recommended_version_list. --- src/test/test_dir.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index ad5f08643..4cdbfb4f8 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -5456,6 +5456,57 @@ test_dir_assumed_flags(void *arg) routerstatus_free(rs); } +static void +test_dir_format_versions_list(void *arg) +{ + (void)arg; + char *s = NULL; + config_line_t *lines = NULL; + + setup_capture_of_logs(LOG_WARN); + s = format_recommended_version_list(lines, 1); + tt_str_op(s, OP_EQ, ""); + + tor_free(s); + config_line_append(&lines, "ignored", "0.3.4.1, 0.2.9.111-alpha, 4.4.4-rc"); + s = format_recommended_version_list(lines, 1); + tt_str_op(s, OP_EQ, "0.2.9.111-alpha,0.3.4.1,4.4.4-rc"); + + tor_free(s); + config_line_append(&lines, "ignored", "0.1.2.3,0.2.9.10 "); + s = format_recommended_version_list(lines, 1); + tt_str_op(s, OP_EQ, "0.1.2.3,0.2.9.10,0.2.9.111-alpha,0.3.4.1,4.4.4-rc"); + + /* There should be no warnings so far. */ + expect_no_log_entry(); + + /* Now try a line with a space in it. */ + tor_free(s); + config_line_append(&lines, "ignored", "1.3.3.8 1.3.3.7"); + s = format_recommended_version_list(lines, 1); + tt_str_op(s, OP_EQ, "0.1.2.3,0.2.9.10,0.2.9.111-alpha,0.3.4.1," + "1.3.3.7,1.3.3.8,4.4.4-rc"); + + expect_single_log_msg_containing( + "Unexpected space in versions list member \"1.3.3.8 1.3.3.7\"." ); + + /* Start over, with a line containing a bogus version */ + config_free_lines(lines); + lines = NULL; + tor_free(s); + mock_clean_saved_logs(); + config_line_append(&lines, "ignored", "0.1.2.3, alpha-complex, 0.1.1.8-rc"); + s = format_recommended_version_list(lines,1); + tt_str_op(s, OP_EQ, "0.1.1.8-rc,0.1.2.3,alpha-complex"); + expect_single_log_msg_containing( + "Recommended version \"alpha-complex\" does not look valid."); + + done: + tor_free(s); + config_free_lines(lines); + teardown_capture_of_logs(); +} + #define DIR_LEGACY(name) \ { #name, test_dir_ ## name , TT_FORK, NULL, NULL } @@ -5511,6 +5562,6 @@ struct testcase_t dir_tests[] = { DIR_ARG(find_dl_schedule, TT_FORK, "cf"), DIR_ARG(find_dl_schedule, TT_FORK, "ca"), DIR(assumed_flags, 0), + DIR(format_versions_list, TT_FORK), END_OF_TESTCASES }; -

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 18 Jul '18

18 Jul '18

commit d8e3b201fb0d58648e6e079e48c7d12bc0a84a4f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 18 18:49:39 2018 +0000 Update translations for support-portal --- contents+fr.po | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/contents+fr.po b/contents+fr.po index dac8f93c8..70ab92e62 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -443,6 +443,9 @@ msgid "" " on your Desktop, though be aware that you may have accidentally unticked " "the option to create a shortcut." msgstr "" +"Les paramètres par défaut du programme d'installation Windows crée également" +" un raccourci pour vous sur votre Bureau, mais sachez qu'il est possible que" +" vous ayez accidentellement décoché l'option pour créer un raccourci." #: http//localhost/tbb/tbb-11/ #: (content/tbb/tbb-11/contents+en.lrquestion.description) @@ -450,6 +453,9 @@ msgid "" "If you can't find it in either of those folders, download it again and look " "for the prompt that asks you to choose a directory to download it in." msgstr "" +"Si vous ne le trouvez pas dans l'un de ces dossiers, téléchargez le à " +"nouveau et portez attention au message qui vous demande de choisir un " +"répertoire pour le téléchargement." #: http//localhost/tbb/tbb-11/ #: (content/tbb/tbb-11/contents+en.lrquestion.description) @@ -481,6 +487,10 @@ msgid "" "piece of software that can easily compromise your privacy or serve you " "malware." msgstr "" +"Nous ne pensons pas que Flash soit sûr d'utilisation dans quelque navigateur" +" que ce soit — c'est un logiciel qui présente de grands risques de sécurité," +" qui peut aisément compromettre votre confidentialité ou vous exposer à des " +"programmes malveillants." #: http//localhost/tbb/tbb-12/ #: (content/tbb/tbb-12/contents+en.lrquestion.description)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 18 Jul '18

18 Jul '18

commit 008e2db9d6e2dccb16fbedc04e0b6832a66f783d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 18 18:19:39 2018 +0000 Update translations for support-portal --- contents+fr.po | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 4e0cd94a7..dac8f93c8 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -334,6 +334,9 @@ msgid "" "Most antivirus or malware protection allows the user to \"whitelist\" " "certain processes that would otherwise be blocked." msgstr "" +"La plupart des antivirus et des protections contre les programmes " +"malveillants permettent à l'utilisateur de placer certains processus qui " +"seraient autrement bloqués en \"liste blanche\"." #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) @@ -341,16 +344,19 @@ msgid "" "Please open your antivirus or malware protection software and look in the " "settings for a \"whitelist\" or something similar." msgstr "" +"Ouvrez votre logiciel antivirus ou de protection contre les programmes " +"malveillants et cherchez dans les paramètres une liste blanche ou quelque " +"chose de similaire." #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) msgid "Next, exclude the following processes:" -msgstr "" +msgstr "Ensuite, excluez les processus suivants:" #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) msgid "* For Windows" -msgstr "" +msgstr "* Pour Windows" #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) @@ -360,32 +366,32 @@ msgstr "* firefox.exe" #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) msgid "* tor.exe" -msgstr "" +msgstr "* tor.exe" #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) msgid "* obfs4proxy.exe (if you use bridges)" -msgstr "" +msgstr "* obfs4proxy.exe (si vous utilisez des ponts)" #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) msgid "* For OS X" -msgstr "" +msgstr "* Pour OS X" #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) msgid "* TorBrowser" -msgstr "" +msgstr "* TorBrowser" #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) msgid "* tor.real" -msgstr "" +msgstr "* tor.real" #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) msgid "* obfs4proxy (if you use bridges)" -msgstr "" +msgstr "* obfs4proxy (si vous utilisez des ponts)" #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) @@ -395,7 +401,7 @@ msgstr "<Enfin, redémarrez le Navigateur Tor." #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) msgid "This should fix the issues you're experiencing." -msgstr "" +msgstr "Cela devrait résoudre les problèmes que vous rencontrez." #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) @@ -403,6 +409,8 @@ msgid "" "Please note that some antivirus clients, like Kaspersky, may also be " "blocking Tor at the firewall level." msgstr "" +"Veuillez prendre note que certains antivirus, comme Kaspersky, peuvent aussi" +" bloquer Tor au niveau du pare-feu." #: http//localhost/tbb/tbb-11/ #: (content/tbb/tbb-11/contents+en.lrquestion.title) @@ -416,6 +424,8 @@ msgstr "" #: (content/tbb/tbb-11/contents+en.lrquestion.description) msgid "The file you download and run prompts you for a destination." msgstr "" +"Le fichier que vous avez téléchargé et exécuté vous demande d'entrer un " +"dossier de destination." #: http//localhost/tbb/tbb-11/ #: (content/tbb/tbb-11/contents+en.lrquestion.description) @@ -423,6 +433,8 @@ msgid "" "If you don't remember what this destination was, it's most likely your " "Downloads or Desktop folder." msgstr "" +"Si vous ne vous souvenez pas de ce qu'était le dossier de destination, il " +"s'agit très probablement de votre dossier Téléchargement ou Bureau." #: http//localhost/tbb/tbb-11/ #: (content/tbb/tbb-11/contents+en.lrquestion.description)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 18 Jul '18

18 Jul '18

commit 7f4b44420d96d6d790cefd71a813f27f9d066cc0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 18 17:49:35 2018 +0000 Update translations for support-portal --- contents+fr.po | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index b551d54c9..4e0cd94a7 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -95,6 +95,9 @@ msgid "" "see that you're using Tor, but they won't know where you're going when you " "do." msgstr "" +"Certaines organisations, comme votre Fournisseur d'Accès à Internet (FAI), " +"pourraient voir que vous utilisez Tor, mais ils ne sauront pas où vous allez" +" quand c'est le cas." #: http//localhost/faq/faq-2/ (content/faq/faq-2/contents+en.lrquestion.title) #: http//localhost/tbb/tbb-8/ (content/tbb/tbb-8/contents+en.lrquestion.title) @@ -117,6 +120,8 @@ msgid "" "Tor Browser can certainly help people access your website in places where it" " is blocked." msgstr "" +"Le Navigateur Tor peut tout à fait aider les gens à accéder à votre site à " +"des endroits où il est bloqué." #: http//localhost/faq/faq-2/ #: (content/faq/faq-2/contents+en.lrquestion.description) @@ -130,6 +135,10 @@ msgid "" "Browser</a> and then using it to navigate to the blocked site will " "allow access." msgstr "" +"La plupart du temps, le simple fait de télécharger le <a " +"href=\"https://www.torproject.org/download/download-" +"easy.html.en\">Navigateur Tor</a>et de l'utiliser pour naviguer " +"jusqu'au site bloqué permettra l'accès." #: http//localhost/faq/faq-2/ #: (content/faq/faq-2/contents+en.lrquestion.description) @@ -143,8 +152,8 @@ msgid "" "href=\"https://www.torproject.org/docs/pluggable-" "transports.html.en\">pluggable transports</a>." msgstr "" -"Pour les endroits soumis à une censure forte, de nombreuses options de " -"contournement sont offertes, dont les <a " +"Pour les endroits soumis à une lourde censure, de nombreuses options de " +"contournement sont disponibles, dont les <a " "href=\"https://www.torproject.org/docs/pluggable-" "transports.html.en\">transports enfichables</a>." @@ -160,6 +169,10 @@ msgid "" " <a href=\"https://tb-manual.torproject.org/en-" "US/circumvention.html\">censorship</a>." msgstr "" +"Pour plus d'information, veuillez vous référer à la section du <a " +"href=\"https://tb-manual.torproject.org/en-US/\">manuel d'utilisateur du " +"Navigateur Tor</a> concernant la <a href=\"https://tb-" +"manual.torproject.org/en-US/circumvention.html\">censure</a>." #: http//localhost/faq/faq-3/ (content/faq/faq-3/contents+en.lrquestion.title) #: http//localhost/tbb/tbb-14/ @@ -179,6 +192,9 @@ msgid "" "It's strongly discouraged to install new add-ons in Tor Browser, because " "they can compromise your privacy and security." msgstr "" +"Il est fortement recommandé de ne pas installer d'extensions supplémentaires" +" dans le Navigateur Tor, car elles peuvent compromettre votre " +"confidentialité et votre sécurité." #: http//localhost/faq/faq-3/ #: (content/faq/faq-3/contents+en.lrquestion.description) @@ -188,6 +204,9 @@ msgid "" "Tor Browser already comes installed with two add-ons — HTTPS Everywhere and " "NoScript — and adding anything else could deanonymize you." msgstr "" +"Le Navigateur Tor comprend déjà deux extensions pré-installées — HTTPS " +"Everywhere et NoScript — et ajouter quoi que ce soit d'autre pourrait vous " +"faire perdre votre anonymat." #: http//localhost/faq/faq-4/ (content/faq/faq-4/contents+en.lrquestion.title) #: http//localhost/tbb/tbb-31/ @@ -239,6 +258,9 @@ msgid "" " advanced user who knows how to configure both in a way that doesn't " "compromise your privacy." msgstr "" +"En général, nous recommandons de ne pas utiliser un VPN avec Tor à moins que" +" vous ne soyez un utilisateur expert qui sait comment configurer l'un et " +"l'autre de manière à ne pas compromettre votre confidentialité." #: http//localhost/faq/faq-5/ #: (content/faq/faq-5/contents+en.lrquestion.description) @@ -249,6 +271,10 @@ msgid "" "href=\"https://trac.torproject.org/projects/tor/wiki/doc/TorPlusVPN\">our " "wiki</a>." msgstr "" +"Vous pouvez trouver de l'information plus détaillée sur Tor + VPN sur " +"<a " +"href=\"https://trac.torproject.org/projects/tor/wiki/doc/TorPlusVPN\">notre " +"wiki</a>." #: http//localhost/tbb/tbb-1/ (content/tbb/tbb-1/contents+en.lrquestion.title) msgid "" @@ -264,6 +290,9 @@ msgid "" "Whenever we release a new stable version of Tor Browser, we write a blog " "post that details its new features and known issues." msgstr "" +"Chaque fois que nous publions une nouvelle version stable du Navigateur Tor," +" nous écrivons un billet de blog qui détaille ses nouvelles fonctionnalités " +"ainsi que les problèmes connus." #: http//localhost/tbb/tbb-1/ #: (content/tbb/tbb-1/contents+en.lrquestion.description) @@ -273,6 +302,11 @@ msgid "" "href=\"https://blog.torproject.org></a>blog.torproject.org for the " "most recent stable Tor Browser post to see if your issue is listed." msgstr "" +"Si vous vous êtes mis à avoir des problèmes avec votre Navigateur Tor après " +"une mise à jour, consultez le post concernant la version stable du " +"Navigateur Tor la plus récente sur <a " +"href=\"https://blog.torproject.org></a>blog.torproject.org pour voir " +"si votre problème est listé." #: http//localhost/tbb/tbb-1/ #: (content/tbb/tbb-1/contents+en.lrquestion.description) @@ -281,6 +315,9 @@ msgid "" "href=\"https://trac.torproject.org\">bug report</a> about what you're" " experiencing." msgstr "" +"Si votre problème n'est pas listé, veuillez déposer un <a " +"href=\"https://trac.torproject.org\">rapport de bogue</a> à propos du" +" problème que vous rencontrez." #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.title)

1 0

[tor/master] Merge remote-tracking branch 'teor/ticket26852'
by nickm＠torproject.org 18 Jul '18

18 Jul '18

commit 88bb80d5fc83e97cb099cb4887d83a2400fd9830 Merge: ef5c3c821 62ecb5e88 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 18 13:20:23 2018 -0400 Merge remote-tracking branch 'teor/ticket26852' doc/HACKING/HelpfulTools.md | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-)

1 0

[tor/master] doc: Document Appveyor and Jenkins in doc/HACKING/HelpfulTools.md
by nickm＠torproject.org 18 Jul '18

18 Jul '18

commit 62ecb5e88f2adc31d049d824c41022f0d66d11cd Author: teor <teor2345(a)gmail.com> Date: Wed Jul 18 12:06:48 2018 +1000 doc: Document Appveyor and Jenkins in doc/HACKING/HelpfulTools.md Closes 26852. --- doc/HACKING/HelpfulTools.md | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/doc/HACKING/HelpfulTools.md b/doc/HACKING/HelpfulTools.md index 13d1c4b0d..d49923852 100644 --- a/doc/HACKING/HelpfulTools.md +++ b/doc/HACKING/HelpfulTools.md @@ -4,9 +4,16 @@ Useful tools These aren't strictly necessary for hacking on Tor, but they can help track down bugs. -Travis CI ---------- -It's CI. Looks like this: https://travis-ci.org/torproject/tor. +Travis/Appveyor CI +------------------ +It's CI. + +Looks like this: +* https://travis-ci.org/torproject/tor +* https://ci.appveyor.com/project/torproject/tor + +Travis builds and runs tests on Linux, and eventually macOS (#24629). +Appveyor builds and runs tests on Windows (using Windows Services for Linux). Runs automatically on Pull Requests sent to torproject/tor. You can set it up for your fork to build commits outside of PRs too: @@ -16,6 +23,8 @@ for your fork to build commits outside of PRs too: https://help.github.com/articles/fork-a-repo/ 3. follow https://docs.travis-ci.com/user/getting-started/#To-get-started-with-Travis…. skip steps involving `.travis.yml` (we already have one). +4. go to https://ci.appveyor.com/login , log in with github, and select + "NEW PROJECT" Builds should show up on the web at travis-ci.com and on IRC at #tor-ci on OFTC. If they don't, ask #tor-dev (also on OFTC). @@ -23,7 +32,16 @@ OFTC. If they don't, ask #tor-dev (also on OFTC). Jenkins ------- - https://jenkins.torproject.org +It's CI/builders. Looks like this: https://jenkins.torproject.org + +Runs automatically on commits merged to git.torproject.org. We CI the +master branch and all supported tor versions. We also build nightly debian +packages from master. + +Builds Linux and Windows cross-compilation. Runs Linux tests. + +Builds should show up on the web at jenkins.torproject.org and on IRC at +#tor-bots on OFTC. If they don't, ask #tor-dev (also on OFTC). Valgrind --------

1 0