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

[translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
by translation＠torproject.org 23 Feb '21

23 Feb '21

commit 31cc3a479544d6b0fc400cd313a116b5789826fc Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 23 17:16:01 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- ar/messages.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ar/messages.json b/ar/messages.json index 62d8c89529..55e8efdc9f 100644 --- a/ar/messages.json +++ b/ar/messages.json @@ -36,7 +36,7 @@ "message": "ملفات تعريف الارتباط (كوكيز) غير مفعلة." }, "websiteIntro": { - "message": "Snowflake is a system to defeat internet censorship. People who are censored can use Snowflake to access the internet. Their connection goes through Snowflake proxies, which are run by volunteers. For more detailed information about how Snowflake works see our <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\">documentation wiki</a>." + "message": "Snowflake هو نظام لهزيمة الرقابة على الإنترنت. يمكن للأشخاص الخاضعين للرقابة استخدام Snowflake للوصول إلى الإنترنت. يمر اتصالهم عبر وكلاء Snowflake ، والتي يديرها متطوعون. لمزيد من المعلومات التفصيلية حول كيفية عمل Snowflake ، راجع <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\"> ويكي التوثيق </a> الخاص بنا." }, "browser": { "message": "المتصفح" @@ -63,10 +63,10 @@ "message": "إذا واجهت مشاكل مع Snowflake كعميل أو وكيل ، فالرجاء التفكير في إرسال تقرير خطأ. هناك طريقتان لتقديم تقرير خطأ:" }, "sharedAccount": { - "message": "File an <a href=\"https://anonticket.onionize.space/\">anonymous ticket</a> by generating an identifier and logging in with it. Then, find the Snowflake project in the List of all projects and create a new issue." + "message": "قم بتقديم<a href=\"https://anonticket.onionize.space/\"> بطاقة مجهولة</a> عن طريق إنشاء معرّف وتسجيل الدخول بها. بعد ذلك ، ابحث عن مشروع Snowflake في قائمة جميع المشاريع وأنشئ عددًا جديدًا." }, "bugTracker": { - "message": "<a href=\"https://gitlab.onionize.space/\">Request an account</a> at the Tor Project GitLab, then <a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">open a new issue</a> in the Snowflake project." + "message": "<a href=\"https://gitlab.onionize.space/\">اطلب حسابًا</a> في Tor Project GitLab ، ثم<a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…"> افتح إصدارًا جديدًا </a>في مشروع Snowflake." }, "descriptive": { "message": "يرجى محاولة أن تكون وصفيًا قدر الإمكان مع تذكرتك ، وإذا أمكن ، قم بتضمين رسائل السجل التي ستساعدنا في إعادة إنتاج الخطأ." @@ -84,6 +84,6 @@ "message": "الأسئلة الشائعة" }, "support": { - "message": "See the <a href=\"https://support.torproject.org/censorship/\">Censorship</a> topic in Tor's <a href=\"https://support.torproject.org/\">Support Portal</a>." + "message": "راجع موضوع<a href=\"https://support.torproject.org/censorship/\"> الرقابة </a>الموضوع في Tor's <a href=\"https://support.torproject.org/\">بوابة الدعم</a> ." } }

1 0

[translation/snowflakeaddon-messages.json_completed] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed
by translation＠torproject.org 23 Feb '21

23 Feb '21

commit 2366240ddd254d274a78488bd0eb86278d1b0f6c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 23 16:45:56 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- fr/messages.json | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/fr/messages.json b/fr/messages.json index b77d0b8ba1..aed8e78a49 100644 --- a/fr/messages.json +++ b/fr/messages.json @@ -36,10 +36,7 @@ "message": "Les témoins ne sont pas activés." }, "websiteIntro": { - "message": "Snowflake est un système pour contrecarrer la censure sur Internet. Les personnes victimes de censure peuvent utiliser Snowflake pour accéder à Internet. Leur connexion passe par des mandataires Snowflake dont les opérateurs sont des bénévoles. Pour de plus amples renseignements sur le fonctionnement de Snowflake, consultez notre <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\" data-msgid=\"__MSG_docWiki__\">wiki de documentation</a> (page en anglais)." - }, - "docWiki": { - "message": "wiki de documentation" + "message": "Snowflake est un système pour contrecarrer la censure sur Internet. Les personnes victimes de censure peuvent utiliser Snowflake pour accéder à Internet. Leur connexion passe par des mandataires Snowflake qui sont exploités par des bénévoles. Pour de plus amples renseignements sur le fonctionnement de Snowflake, consultez notre <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\">wiki de documentation</a> (page en anglais)." }, "browser": { "message": "Navigateur" @@ -66,10 +63,10 @@ "message": "Si vous rencontrez des problèmes avec Snowflake comme client ou comme mandataire, veuillez envisager de remplir un relevé de bogue. Deux options s’offrent à vous :" }, "sharedAccount": { - "message": "Modifiez <a href=\"https://pad.riseup.net/p/tor-anti-censorship-bugs-keep\">le bloc-notes public de signalement de bogues</a> de l’équipe anticensure." + "message": "Remplissez un <a href=\"https://anonticket.onionize.space/\">ticket anonyme</a> (site en anglais) en générant un identifiant et en l’utilisant pour vous connecter. Ensuite, trouvez le projet Snowflake dans la liste de tous les projets et créez un nouveau ticket de problème." }, "bugTracker": { - "message": "<a href=\"https://gitlab.torproject.org/\">Demandez un compte</a> sur le GitLab du Projet Tor, puis <a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">créez un nouveau ticket de problème</a> pour le projet Snowflake." + "message": "<a href=\"https://gitlab.onionize.space/\">Demandez un compte</a> sur le GitLab du Projet Tor, puis <a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">créez un nouveau ticket de problème</a> pour le projet Snowflake." }, "descriptive": { "message": "Veuillez essayer de créer un ticket des plus descriptif et si possible, joignez-y des messages de journalisation qui nous aideront à reproduire le bogue." @@ -82,5 +79,11 @@ }, "looksLike": { "message": "Qui ressemble à ceci :" + }, + "faq": { + "message": "FAQ" + }, + "support": { + "message": "Consultez le sujet <a href=\"https://support.torproject.org/fr/censorship/\">Censure</a> du <a href=\"https://support.torproject.org/fr/\">portail d’assistance</a> de Tor." } }

1 0

[translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
by translation＠torproject.org 23 Feb '21

23 Feb '21

commit be03961232f8587a0e29a9b28a14a0d46dc30767 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 23 16:45:54 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- fr/messages.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fr/messages.json b/fr/messages.json index d9e96469e7..aed8e78a49 100644 --- a/fr/messages.json +++ b/fr/messages.json @@ -36,7 +36,7 @@ "message": "Les témoins ne sont pas activés." }, "websiteIntro": { - "message": "Snowflake is a system to defeat internet censorship. People who are censored can use Snowflake to access the internet. Their connection goes through Snowflake proxies, which are run by volunteers. For more detailed information about how Snowflake works see our <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\">documentation wiki</a>." + "message": "Snowflake est un système pour contrecarrer la censure sur Internet. Les personnes victimes de censure peuvent utiliser Snowflake pour accéder à Internet. Leur connexion passe par des mandataires Snowflake qui sont exploités par des bénévoles. Pour de plus amples renseignements sur le fonctionnement de Snowflake, consultez notre <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\">wiki de documentation</a> (page en anglais)." }, "browser": { "message": "Navigateur" @@ -63,10 +63,10 @@ "message": "Si vous rencontrez des problèmes avec Snowflake comme client ou comme mandataire, veuillez envisager de remplir un relevé de bogue. Deux options s’offrent à vous :" }, "sharedAccount": { - "message": "File an <a href=\"https://anonticket.onionize.space/\">anonymous ticket</a> by generating an identifier and logging in with it. Then, find the Snowflake project in the List of all projects and create a new issue." + "message": "Remplissez un <a href=\"https://anonticket.onionize.space/\">ticket anonyme</a> (site en anglais) en générant un identifiant et en l’utilisant pour vous connecter. Ensuite, trouvez le projet Snowflake dans la liste de tous les projets et créez un nouveau ticket de problème." }, "bugTracker": { - "message": "<a href=\"https://gitlab.onionize.space/\">Request an account</a> at the Tor Project GitLab, then <a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">open a new issue</a> in the Snowflake project." + "message": "<a href=\"https://gitlab.onionize.space/\">Demandez un compte</a> sur le GitLab du Projet Tor, puis <a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">créez un nouveau ticket de problème</a> pour le projet Snowflake." }, "descriptive": { "message": "Veuillez essayer de créer un ticket des plus descriptif et si possible, joignez-y des messages de journalisation qui nous aideront à reproduire le bogue." @@ -84,6 +84,6 @@ "message": "FAQ" }, "support": { - "message": "See the <a href=\"https://support.torproject.org/censorship/\">Censorship</a> topic in Tor's <a href=\"https://support.torproject.org/\">Support Portal</a>." + "message": "Consultez le sujet <a href=\"https://support.torproject.org/fr/censorship/\">Censure</a> du <a href=\"https://support.torproject.org/fr/\">portail d’assistance</a> de Tor." } }

1 0

[tor/master] dos: Change the DoS heartbeat line format
by nickm＠torproject.org 23 Feb '21

23 Feb '21

commit c96465259a71741eb90486056a62376c3475007e Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 23 08:54:45 2021 -0500 dos: Change the DoS heartbeat line format Fix a bug introduced in 94b56eaa7597e4a091a5b51d2c9032ea046631e3 which overwrite the connection message line. Furthermore, improve how we generate that line by using a smartlist and change the format so it is clearer of what is being rejected/detected and, if applicable, which option is disabled thus yielding no stats. Closes #40308 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/changes40308 | 5 ++++ src/core/or/dos.c | 74 ++++++++++++++++++++++++-------------------------- src/test/test_status.c | 4 ++- 3 files changed, 43 insertions(+), 40 deletions(-) diff --git a/changes/changes40308 b/changes/changes40308 new file mode 100644 index 0000000000..d2b91f9299 --- /dev/null +++ b/changes/changes40308 @@ -0,0 +1,5 @@ + o Minor feature (DoS log heartbeat): + - Change the DoS subsystem heartbeat line format so be more clear on what + has been detected/rejected and which option is disabled if any. Closes + ticket 40308. + diff --git a/src/core/or/dos.c b/src/core/or/dos.c index ba4e5442d6..b00863c118 100644 --- a/src/core/or/dos.c +++ b/src/core/or/dos.c @@ -776,58 +776,54 @@ dos_should_refuse_single_hop_client(void) void dos_log_heartbeat(void) { - char *conn_msg = NULL; - char *cc_msg = NULL; - char *single_hop_client_msg = NULL; - char *circ_stats_msg = NULL; - char *hs_dos_intro2_msg = NULL; + smartlist_t *elems = smartlist_new(); /* Stats number coming from relay.c append_cell_to_circuit_queue(). */ - tor_asprintf(&circ_stats_msg, - " %" PRIu64 " circuits killed with too many cells.", - stats_n_circ_max_cell_reached); + smartlist_add_asprintf(elems, + "%" PRIu64 " circuits killed with too many cells", + stats_n_circ_max_cell_reached); if (dos_cc_enabled) { - tor_asprintf(&cc_msg, - " %" PRIu64 " circuits rejected," - " %" PRIu32 " marked addresses.", - cc_num_rejected_cells, cc_num_marked_addrs); + smartlist_add_asprintf(elems, + "%" PRIu64 " circuits rejected, " + "%" PRIu32 " marked addresses", + cc_num_rejected_cells, cc_num_marked_addrs); + } else { + smartlist_add_asprintf(elems, "[DoSCircuitCreationEnabled disabled]"); } if (dos_conn_enabled) { - tor_asprintf(&conn_msg, - " %" PRIu64 " connections closed.", - conn_num_addr_rejected); - tor_asprintf(&conn_msg, - " %" PRIu64 " connect() connections closed.", - conn_num_addr_connect_rejected); + smartlist_add_asprintf(elems, + "%" PRIu64 " same address concurrent " + "connections rejected", conn_num_addr_rejected); + smartlist_add_asprintf(elems, + "%" PRIu64 " connections rejected", + conn_num_addr_connect_rejected); + } else { + smartlist_add_asprintf(elems, "[DoSConnectionEnabled disabled]"); } if (dos_should_refuse_single_hop_client()) { - tor_asprintf(&single_hop_client_msg, - " %" PRIu64 " single hop clients refused.", - num_single_hop_client_refused); + smartlist_add_asprintf(elems, + "%" PRIu64 " single hop clients refused", + num_single_hop_client_refused); + } else { + smartlist_add_asprintf(elems, + "[DoSRefuseSingleHopClientRendezvous disabled]"); } /* HS DoS stats. */ - tor_asprintf(&hs_dos_intro2_msg, - " %" PRIu64 " INTRODUCE2 rejected.", - hs_dos_get_intro2_rejected_count()); - - log_notice(LD_HEARTBEAT, - "DoS mitigation since startup:%s%s%s%s%s", - circ_stats_msg, - (cc_msg != NULL) ? cc_msg : " [cc not enabled]", - (conn_msg != NULL) ? conn_msg : " [conn not enabled]", - (single_hop_client_msg != NULL) ? single_hop_client_msg : "", - (hs_dos_intro2_msg != NULL) ? hs_dos_intro2_msg : ""); - - tor_free(conn_msg); - tor_free(cc_msg); - tor_free(single_hop_client_msg); - tor_free(circ_stats_msg); - tor_free(hs_dos_intro2_msg); - return; + smartlist_add_asprintf(elems, + "%" PRIu64 " INTRODUCE2 rejected", + hs_dos_get_intro2_rejected_count()); + + char *msg = smartlist_join_strings(elems, ", ", 0, NULL); + + log_notice(LD_HEARTBEAT, "DoS mitigation since startup: %s.", msg); + + tor_free(msg); + SMARTLIST_FOREACH(elems, char *, e, tor_free(e)); + smartlist_free(elems); } /* Called when a new client connection has been established on the given diff --git a/src/test/test_status.c b/src/test/test_status.c index b938b86326..223aeffb3b 100644 --- a/src/test/test_status.c +++ b/src/test/test_status.c @@ -360,7 +360,9 @@ test_status_hb_not_in_consensus(void *arg) "initiated 0 and received 0 v4 connections; " "initiated 0 and received 0 v5 connections.\n"); expect_log_msg("DoS mitigation since startup: 0 circuits killed with " - "too many cells. [cc not enabled] [conn not enabled] " + "too many cells, [DoSCircuitCreationEnabled disabled], " + "[DoSConnectionEnabled disabled], " + "[DoSRefuseSingleHopClientRendezvous disabled], " "0 INTRODUCE2 rejected.\n"); tt_int_op(mock_saved_log_n_entries(), OP_EQ, 6);

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/320'
by nickm＠torproject.org 23 Feb '21

23 Feb '21

commit bc799a1eaf85fc218156e014c83cc1d5c096e16a Merge: 100221baac c96465259a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 23 09:29:49 2021 -0500 Merge remote-tracking branch 'tor-gitlab/mr/320' changes/changes40308 | 5 ++++ src/core/or/dos.c | 74 ++++++++++++++++++++++++-------------------------- src/test/test_status.c | 4 ++- 3 files changed, 43 insertions(+), 40 deletions(-)

1 0

[translation/snowflakeaddon-messages.json_completed] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed
by translation＠torproject.org 23 Feb '21

23 Feb '21

commit 473ca7a7ab42e5a49f2dff51b49d2729c06b0882 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 23 14:16:10 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- tr/messages.json | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tr/messages.json b/tr/messages.json index 5e781d8b49..a770ddc89b 100644 --- a/tr/messages.json +++ b/tr/messages.json @@ -36,10 +36,7 @@ "message": "Çerezler etkin değil." }, "websiteIntro": { - "message": "Snowflake İnternet sansürünü aşmaya yönelik bir sistemdir. Sansüre uğrayan kişiler, Snowflake kullanarak İnternete erişebilir. Bağlantı, gönüllüler tarafından işletilen Snowflake vekil sunucuları üzerinden kurulur. Snowflake hakkında ayrıntılı bilgi almak için <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\" data-msgid=\"__MSG_docWiki__\">Viki</a> sayfamıza bakabilirsiniz." - }, - "docWiki": { - "message": "Viki sayfası" + "message": "Snowflake is a system to defeat internet censorship. People who are censored can use Snowflake to access the internet. Their connection goes through Snowflake proxies, which are run by volunteers. For more detailed information about how Snowflake works see our <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\">documentation wiki</a>." }, "browser": { "message": "Tarayıcı" @@ -66,10 +63,10 @@ "message": "Bir istemci ya da vekil sunucu olarak Snowflake kullanırken sorun yaşarsanız, hata bildiriminde bulunmanız iyi olur. Hata bildirimini iki şekilde gönderebilirsiniz:" }, "sharedAccount": { - "message": "Anti sansür ekibinin <a href=\"https://pad.riseup.net/p/tor-anti-censorship-bugs-keep\">herkese açık hata bildirimi panosunu</a> kullanabilirsiniz." + "message": "File an <a href=\"https://anonticket.onionize.space/\">anonymous ticket</a> by generating an identifier and logging in with it. Then, find the Snowflake project in the List of all projects and create a new issue." }, "bugTracker": { - "message": "Tor Project GitLab üzerinde <a href=\"https://gitlab.torproject.org/\">bir hesap açılmasını istedikten</a> sonra Snowflake projesinde <a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">yeni bir sorun bildirebilirsiniz</a>." + "message": "<a href=\"https://gitlab.onionize.space/\">Request an account</a> at the Tor Project GitLab, then <a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">open a new issue</a> in the Snowflake project." }, "descriptive": { "message": "Lütfen bildirim kaydında olabildiğince açıklayıcı olun ve yapabiliyorsanız hatayı yeniden oluşturmamıza yardımcı olabilecek günlük kayıtlarını ekleyin." @@ -82,5 +79,11 @@ }, "looksLike": { "message": "Şu şekilde görüntülenir:" + }, + "faq": { + "message": "FAQ" + }, + "support": { + "message": "See the <a href=\"https://support.torproject.org/censorship/\">Censorship</a> topic in Tor's <a href=\"https://support.torproject.org/\">Support Portal</a>." } }

1 0

[translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
by translation＠torproject.org 23 Feb '21

23 Feb '21

commit eb4e4cb361f2f255617740178c4e6d67ca8d1161 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 23 14:16:08 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- tr/messages.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tr/messages.json b/tr/messages.json index e88a0c465f..23a7e104dc 100644 --- a/tr/messages.json +++ b/tr/messages.json @@ -36,7 +36,7 @@ "message": "Çerezler etkin değil." }, "websiteIntro": { - "message": "Snowflake is a system to defeat internet censorship. People who are censored can use Snowflake to access the internet. Their connection goes through Snowflake proxies, which are run by volunteers. For more detailed information about how Snowflake works see our <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\">documentation wiki</a>." + "message": "Snowflake İnternet sansürünü aşmaya yönelik bir sistemdir. Sansüre uğrayan kişiler, Snowflake kullanarak İnternete erişebilir. Bağlantı, gönüllüler tarafından işletilen Snowflake vekil sunucuları üzerinden kurulur. Snowflake hakkında information about how Snowflake works see our <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\">belgeler viki</a> sayfamıza bakabilirsiniz." }, "browser": { "message": "Tarayıcı" @@ -63,10 +63,10 @@ "message": "Bir istemci ya da vekil sunucu olarak Snowflake kullanırken sorun yaşarsanız, hata bildiriminde bulunmanız iyi olur. Hata bildirimini iki şekilde gönderebilirsiniz:" }, "sharedAccount": { - "message": "File an <a href=\"https://anonticket.onionize.space/\">anonymous ticket</a> by generating an identifier and logging in with it. Then, find the Snowflake project in the List of all projects and create a new issue." + "message": "Bir kimlik üretip onunla giriş yaparak <a href=\"https://anonticket.onionize.space/\">anonim bir sorun</a> oluşturabilirsiniz. Daha sonra tüm projeler listesinde Snowflake projesini bulun ve yeni bir sorun oluşturun." }, "bugTracker": { - "message": "<a href=\"https://gitlab.onionize.space/\">Request an account</a> at the Tor Project GitLab, then <a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">open a new issue</a> in the Snowflake project." + "message": "Tor Project GitLab üzerinde <a href=\"https://gitlab.onionize.space/\">bir hesap açılmasını istedikten</a> sonra Snowflake projesinde <a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">yeni bir sorun bildirebilirsiniz</a>." }, "descriptive": { "message": "Lütfen bildirim kaydında olabildiğince açıklayıcı olun ve yapabiliyorsanız hatayı yeniden oluşturmamıza yardımcı olabilecek günlük kayıtlarını ekleyin." @@ -84,6 +84,6 @@ "message": "SSS" }, "support": { - "message": "See the <a href=\"https://support.torproject.org/censorship/\">Censorship</a> topic in Tor's <a href=\"https://support.torproject.org/\">Support Portal</a>." + "message": "Tor'un <a href=\"https://support.torproject.org/\">Destek Portalında</a>, <a href=\"https://support.torproject.org/censorship/\">Sansür</a> başlığına bakabilirsiniz." } }

1 0

[tor/master] Merge branch 'ticket40282_046_01_squashed'
by nickm＠torproject.org 23 Feb '21

23 Feb '21

commit 4321755de7d4603561369537f6f7c11cefa49262 Merge: 8907800549 1c45a3df7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 23 08:32:58 2021 -0500 Merge branch 'ticket40282_046_01_squashed' changes/ticket40282 | 6 ++ doc/man/tor.1.txt | 7 ++ src/core/mainloop/mainloop.c | 2 +- src/core/or/circuitbuild.c | 2 +- src/core/or/circuituse.c | 5 +- src/feature/dirclient/dirclient.c | 23 ----- src/feature/relay/relay_periodic.c | 18 +--- src/feature/relay/router.c | 4 +- src/feature/relay/selftest.c | 174 ++++++++----------------------------- src/feature/relay/selftest.h | 13 ++- src/feature/stats/predict_ports.c | 2 - src/test/test_options.c | 43 --------- 12 files changed, 60 insertions(+), 239 deletions(-) diff --cc src/feature/relay/selftest.c index 062b2780e7,66e5db34dd..e4ee524621 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@@ -137,16 -128,9 +130,9 @@@ router_orport_seems_reachable(const or_ return true; } - /** Return 0 if we need to do a DirPort reachability check, because: - * - no reachability check has been done yet, or - * - we've initiated reachability checks, but none have succeeded. - * Return 1 if we don't need to do a DirPort reachability check, because: - * - we've seen a successful reachability check, or - * - there is no DirPort set, or - * - AssumeReachable is set, or - * - We're a dir auth (see ticket #40287), or - * - the network is disabled. - */ -/** Relays no long open a DirPort except authorities. In both cases, no - * reachability self test is done anymore since network re-entry towards an ++/** Relay DirPorts are no longer used (though authorities are). In either case, ++ * reachability self test is done anymore, since network re-entry towards an + * authority DirPort is not allowed. Thus, consider it always reachable. */ int router_dirport_seems_reachable(const or_options_t *options) {

1 0

[tor/master] Merge remote-tracking branch 'origin/master'
by nickm＠torproject.org 23 Feb '21

23 Feb '21

commit 100221baac7e0c0533df009d5b65eae27af12123 Merge: 09614e0c9d 83ab6adb10 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 23 08:43:19 2021 -0500 Merge remote-tracking branch 'origin/master' changes/ticket40253 | 3 + doc/man/tor.1.txt | 24 ++++++ src/core/or/dos.c | 179 +++++++++++++++++++++++++++++++++++----- src/core/or/dos.h | 37 ++++++++- src/core/or/dos_options.inc | 12 +++ src/feature/stats/geoip_stats.c | 2 + src/test/test_dos.c | 65 ++++++++++++++- 7 files changed, 297 insertions(+), 25 deletions(-)

1 0

[tor/master] Tweak documentation on 40282
by nickm＠torproject.org 23 Feb '21

23 Feb '21

commit 09614e0c9db1d65c5f59c3a32c517f115b509021 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 23 08:42:31 2021 -0500 Tweak documentation on 40282 --- changes/ticket40282 | 12 ++++++------ doc/man/tor.1.txt | 6 ++---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/changes/ticket40282 b/changes/ticket40282 index 4cfadcc2c0..2c69a77163 100644 --- a/changes/ticket40282 +++ b/changes/ticket40282 @@ -1,6 +1,6 @@ - o Major feature (relay): - - Relay do not use nor advertise a DirPort anymore. Only authorities do - because it is still used by them. Closes ticket 40282. - - Authority DirPort self reachability test has now been removed because - network reentry to that DirPort is not allowed anymore. - + o Removed features (relay): + - Because DirPorts are only used on authorities, relays no longer + advertise them. Similarly, self-testing for DirPorts has been disabled, + since an unreachable DirPort is no reason for a relay not to advertise + itself. (Configuring a DirPort will still work, for now.) Closes + ticket 40282. diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index 4b34790e00..d51183e04a 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -2795,11 +2795,9 @@ details.) + The same flags are supported here as are supported by ORPort. + - As of Tor 0.4.6.1-alpha, non authoritative relays (see + As of Tor 0.4.6.1-alpha, non-authoritative relays (see AuthoritativeDirectory) will not publish the DirPort but will still listen - on it so to avoid any unknown issues by closing all the sudden all - DirPorts on the network for most relays. We expect relays to stop - listening at some point in future stable releases. It is thus safe for you + on it. Clients don't use the DirPorts on relays, so it is safe for you to remove the DirPort from your torrc configuration. [[DirPortFrontPage]] **DirPortFrontPage** __FILENAME__::

1 0