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

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 19 Mar '21

19 Mar '21

commit 0b6d6502ffaa2bb4c7fbb4c18b1d25737cea9000 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 19 17:45:12 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ar.po | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/contents+ar.po b/contents+ar.po index 2006c54b4d..8f8c2ca688 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -2173,11 +2173,14 @@ msgid "" "Test](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%2…" "/run-emma.md)" msgstr "" +"* [Run Emma Network " +"Test](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%2…" +"/run-emma.md)" #: https//community.torproject.org/user-research/open/ #: (content/user-research/open/contents+en.lrpage.body) msgid "### Other Research" -msgstr "" +msgstr "### أبحاث أخرى" #: https//community.torproject.org/user-research/open/ #: (content/user-research/open/contents+en.lrpage.body) @@ -2187,6 +2190,10 @@ msgid "" "studies.](https://research.torproject.org/techreports/icfp-censored-" "continent-2020-07-31.pdf)" msgstr "" +"* [القارة الخاضعة للرقابة: فهم استخدام الأدوات أثناء الرقابة على الإنترنت في" +" إفريقيا: الكاميرون ونيجيريا وأوغندا وزيمبابوي كدراسات حالة.] " +"(https://research.torproject.org/techreports/icfp-censored-continent-2020-07" +" -31.pdf)" #: https//community.torproject.org/user-research/open/ #: (content/user-research/open/contents+en.lrpage.body)

1 0

[tor/master] Add "Heartbeat" to the start of several heartbeat messages.
by nickm＠torproject.org 19 Mar '21

19 Mar '21

commit 0229d5f81862e8ef6765c6e1e7e6cd78a5a2b4cc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 19 13:33:56 2021 -0400 Add "Heartbeat" to the start of several heartbeat messages. Closes #40322. --- changes/ticket40322 | 3 +++ src/core/or/dos.c | 3 ++- src/core/or/status.c | 2 +- src/test/test_status.c | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/changes/ticket40322 b/changes/ticket40322 new file mode 100644 index 0000000000..18a65b3323 --- /dev/null +++ b/changes/ticket40322 @@ -0,0 +1,3 @@ + o Minor features (logging): + - Edit heartbeat log messages so that more of them begin with the string + "Heartbeat: ". Closes ticket 40322; patch from 'cypherpunks'. diff --git a/src/core/or/dos.c b/src/core/or/dos.c index a5ea53bb3e..e8652c901e 100644 --- a/src/core/or/dos.c +++ b/src/core/or/dos.c @@ -819,7 +819,8 @@ dos_log_heartbeat(void) char *msg = smartlist_join_strings(elems, ", ", 0, NULL); - log_notice(LD_HEARTBEAT, "DoS mitigation since startup: %s.", msg); + log_notice(LD_HEARTBEAT, + "Heartbeat: DoS mitigation since startup: %s.", msg); tor_free(msg); SMARTLIST_FOREACH(elems, char *, e, tor_free(e)); diff --git a/src/core/or/status.c b/src/core/or/status.c index df9577ada5..9e7ae70535 100644 --- a/src/core/or/status.c +++ b/src/core/or/status.c @@ -105,7 +105,7 @@ log_onion_service_stats(void) } log_notice(LD_HEARTBEAT, - "Our onion service%s received %u v3 INTRODUCE2 cells " + "Heartbeat: Our onion service%s received %u v3 INTRODUCE2 cells " "and attempted to launch %d rendezvous circuits.", num_services == 1 ? "" : "s", hs_stats_get_n_introduce2_v3_cells(), diff --git a/src/test/test_status.c b/src/test/test_status.c index 284a6b7eaf..1d371645ae 100644 --- a/src/test/test_status.c +++ b/src/test/test_status.c @@ -359,8 +359,8 @@ test_status_hb_not_in_consensus(void *arg) "initiated 0 and received 0 v3 connections; " "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, [DoSCircuitCreationEnabled disabled], " + expect_log_msg("Heartbeat: DoS mitigation since startup: 0 circuits killed " + "with too many cells, [DoSCircuitCreationEnabled disabled], " "[DoSConnectionEnabled disabled], " "[DoSRefuseSingleHopClientRendezvous disabled], " "0 INTRODUCE2 rejected.\n");

1 0

[tor/master] Move ServerTransport* options to 'Server Options' section.
by nickm＠torproject.org 19 Mar '21

19 Mar '21

commit 2dfa19a871d8f54a91881475820e82246ed66132 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 19 13:23:29 2021 -0400 Move ServerTransport* options to 'Server Options' section. Patch from 'cypherpunks'. Closes #40331. --- changes/ticket-40331 | 3 +++ doc/man/tor.1.txt | 33 ++++++++++++++++----------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/changes/ticket-40331 b/changes/ticket-40331 new file mode 100644 index 0000000000..c99d704c33 --- /dev/null +++ b/changes/ticket-40331 @@ -0,0 +1,3 @@ + o Documentation (doc/man/tor.1.txt) : + - Move the ServerTransport* options options to the SERVER OPTIONS` section . + Closes issue 40331. diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index b43f61d054..a1552ef1aa 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -966,23 +966,6 @@ forward slash (/) in the configuration file and on the command line. If KIST is used in Schedulers, this is a multiplier of the per-socket limit calculation of the KIST algorithm. (Default: 1.0) - -[[ServerTransportListenAddr]] **ServerTransportListenAddr** __transport__ __IP__:__PORT__:: - When this option is set, Tor will suggest __IP__:__PORT__ as the - listening address of any pluggable transport proxy that tries to - launch __transport__. (IPv4 addresses should written as-is; IPv6 - addresses should be wrapped in square brackets.) (Default: none) - -[[ServerTransportOptions]] **ServerTransportOptions** __transport__ __k=v__ __k=v__ ...:: - When this option is set, Tor will pass the __k=v__ parameters to - any pluggable transport proxy that tries to launch __transport__. + - (Example: ServerTransportOptions obfs45 shared-secret=bridgepasswd cache=/var/lib/tor/cache) (Default: none) - -[[ServerTransportPlugin]] **ServerTransportPlugin** __transport__ exec __path-to-binary__ [options]:: - The Tor relay launches the pluggable transport proxy in __path-to-binary__ - using __options__ as its command-line options, and expects to receive - proxied client traffic from it. (Default: none) - [[Socks4Proxy]] **Socks4Proxy** __host__[:__port__]:: Tor will make all OR connections through the SOCKS 4 proxy at host:port (or host:1080 if port is not specified). @@ -2676,6 +2659,22 @@ is non-zero): name lookups that your server does on behalf of clients. (Default: "www.google.com, www.mit.edu, www.yahoo.com, www.slashdot.org") +[[ServerTransportListenAddr]] **ServerTransportListenAddr** __transport__ __IP__:__PORT__:: + When this option is set, Tor will suggest __IP__:__PORT__ as the + listening address of any pluggable transport proxy that tries to + launch __transport__. (IPv4 addresses should written as-is; IPv6 + addresses should be wrapped in square brackets.) (Default: none) + +[[ServerTransportOptions]] **ServerTransportOptions** __transport__ __k=v__ __k=v__ ...:: + When this option is set, Tor will pass the __k=v__ parameters to + any pluggable transport proxy that tries to launch __transport__. + + (Example: ServerTransportOptions obfs45 shared-secret=bridgepasswd cache=/var/lib/tor/cache) (Default: none) + +[[ServerTransportPlugin]] **ServerTransportPlugin** __transport__ exec __path-to-binary__ [options]:: + The Tor relay launches the pluggable transport proxy in __path-to-binary__ + using __options__ as its command-line options, and expects to receive + proxied client traffic from it. (Default: none) + [[ShutdownWaitLength]] **ShutdownWaitLength** __NUM__:: When we get a SIGINT and we're a server, we begin shutting down: we close listeners and start refusing new circuits. After **NUM**

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 19 Mar '21

19 Mar '21

commit c049c54bf4ac6f91d9e00531e53a5ef4c60a3ea9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 19 17:15:10 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ar.po | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index ba09ca7f85..2006c54b4d 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -15,8 +15,8 @@ # Layla Taha <layla(a)asl19.org>, 2021 # ButterflyOfFire, 2021 # Ahmed IB <mee.tbhole(a)gmail.com>, 2021 -# NASI₿ <nomadweb(a)protonmail.ch>, 2021 # Emma Peel, 2021 +# NASI₿ <nomadweb(a)protonmail.ch>, 2021 # msgid "" msgstr "" @@ -24,7 +24,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-18 19:45+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: Emma Peel, 2021\n" +"Last-Translator: NASI₿ <nomadweb(a)protonmail.ch>, 2021\n" "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -452,7 +452,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/ #: (content/relay-operations/technical-setup/guard/contents+en.lrpage.section) msgid "relay operations" -msgstr "" +msgstr "عمليات التتابع" #: https//community.torproject.org/relay/setup/ #: (content/relay-operations/technical-setup/contents+en.lrpage.body) @@ -1265,7 +1265,7 @@ msgstr "" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.section) msgid "community resources" -msgstr "" +msgstr "موارد المجتمع" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1362,8 +1362,7 @@ msgid "" "abuse-templates)." msgstr "" "يمكن للمشغلين تجميع استجابات قوالب شكوى إساءة الاستخدام الخاصة بهم من أحد " -"القوالب العديدة التي أنشأها Tor: [Tor Abuse Templates] (tor-abuse-" -"Templates)." +"القوالب العديدة التي أنشأها Tor: [Tor Abuse Templates](tor-abuse-Templates)." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -2082,7 +2081,7 @@ msgstr "" #: https//community.torproject.org/user-research/persona/ #: (content/user-research/persona/contents+en.lrpage.section) msgid "user research" -msgstr "" +msgstr "بحث المستخدم" #: https//community.torproject.org/user-research/open/ #: (content/user-research/open/contents+en.lrpage.body) @@ -2109,6 +2108,9 @@ msgid "" "Usage](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%…" "/browser-usage.md)" msgstr "" +"* [Tor Browser " +"Usage](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%…" +"/browser-usage.md)" #: https//community.torproject.org/user-research/open/ #: (content/user-research/open/contents+en.lrpage.body) @@ -2117,6 +2119,9 @@ msgid "" "Onboarding](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scr…" "._Tor_Browser_Desktop_-_download__launch__browse.pdf)" msgstr "" +"* [User Research: " +"Onboarding](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scr…" +"._Tor_Browser_Desktop_-_download__launch__browse.pdf)" #: https//community.torproject.org/user-research/open/ #: (content/user-research/open/contents+en.lrpage.body) @@ -2125,6 +2130,9 @@ msgid "" "Bridges](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/script…" "/discovery-bridges.md)" msgstr "" +"* [Discovery: Get " +"Bridges](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/script…" +"/discovery-bridges.md)" #: https//community.torproject.org/user-research/open/ #: (content/user-research/open/contents+en.lrpage.body) @@ -2133,6 +2141,9 @@ msgid "" "Discovery](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scri…" "._User_Needs_Discovery_-_Tor_Browser_Desktop.pdf)" msgstr "" +"* [User Needs " +"Discovery](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scri…" +"._User_Needs_Discovery_-_Tor_Browser_Desktop.pdf)" #: https//community.torproject.org/user-research/open/ #: (content/user-research/open/contents+en.lrpage.body) @@ -2146,11 +2157,14 @@ msgid "" "Onboarding](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scr…" "._Tor_Browser_Android_-_download__launch__browse.pdf)" msgstr "" +"* [User Research: " +"Onboarding](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scr…" +"._Tor_Browser_Android_-_download__launch__browse.pdf)" #: https//community.torproject.org/user-research/open/ #: (content/user-research/open/contents+en.lrpage.body) msgid "### Emma" -msgstr "" +msgstr "### Emma" #: https//community.torproject.org/user-research/open/ #: (content/user-research/open/contents+en.lrpage.body) @@ -10665,9 +10679,9 @@ msgid "" "bin/mailman/listinfo/tor-relays-universities) mailing list (and other " "education institutions too)." msgstr "" -"اشترك في القائمة البريدية لـ [Tor Relays Universities] " -"(https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays-" -"universities) (والمؤسسات التعليمية الأخرى أيضًا)." +"اشترك في القائمة البريدية لـ [Tor Relays " +"Universities](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-" +"relays-universities) (والمؤسسات التعليمية الأخرى أيضًا)." #: https//community.torproject.org/relay/community-resources/good-bad-isps/ #: (content/relay-operations/community-resources/good-bad-isps/contents+en.lrpage.title) @@ -15870,8 +15884,8 @@ msgid "" "If not, you can [build it from " "source](https://gitlab.com/yawning/obfs4#installation)." msgstr "" -"إذا لم يكن الأمر كذلك ، يمكنك [بنائه من المصدر] " -"(https://gitlab.com/yawning/obfs4#installation)" +"إذا لم يكن الأمر كذلك ، يمكنك [بنائه من " +"المصدر](https://gitlab.com/yawning/obfs4#installation)." #: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/ #: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)

1 0

[tor/master] Link to bridges.torproject.org/info in BridgeDistribution entry.
by nickm＠torproject.org 19 Mar '21

19 Mar '21

commit 40294c8ab1a44250845660ca5093e5a001792397 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 19 13:09:40 2021 -0400 Link to bridges.torproject.org/info in BridgeDistribution entry. This incorporates a suggestion from cypherpunks on #40321 Closes #40321. --- doc/man/tor.1.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index a8436f7446..b43f61d054 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -2252,7 +2252,8 @@ is non-zero): bridge descriptor which indicates to the BridgeDB service how it would like its bridge address to be given out. Set it to "none" if you want BridgeDB to avoid distributing your bridge address, or "any" to - let BridgeDB decide. (Default: any) + let BridgeDB decide. See https://bridges.torproject.org/info for a more + up-to-date list of options. (Default: any) [[ContactInfo]] **ContactInfo** __email_address__:: Administrative contact information for this relay or bridge. This line

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 19 Mar '21

19 Mar '21

commit 464e02482ee92f2a8e6a84220409aa396c2dbc77 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 19 16:47:59 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ar.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index 9b5a81e26d..7f0f9da955 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -16,8 +16,8 @@ # kytv <killyourtv(a)i2pmail.org>, 2021 # Ali <aboshanab_(a)hotmail.com>, 2021 # Amin Jobran, 2021 -# Emma Peel, 2021 # NASI₿ <nomadweb(a)protonmail.ch>, 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -25,7 +25,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-01 14:59+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: NASI₿ <nomadweb(a)protonmail.ch>, 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -974,8 +974,8 @@ msgid "" msgstr "" "لكن تور هو أكثر من مجرد برنامج. إنه ثمرة الجهد النابع من الحب المقدم بواسطة " "مجتمع عالمي مكون من أفراد متفانون من أجل حقوق الإنسان. مشروع تور [ملتزم " -"لأقصى حد] (https://blog.torproject.org/tor-social-contract) بالشفافية " -"والأمن الخاص بمستخدميه." +"لأقصى حد](https://blog.torproject.org/tor-social-contract) بالشفافية والأمن" +" الخاص بمستخدميه." #: https//www.torproject.org/about/people/ #: (content/about/people/contents+en.lrpeople.title)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 19 Mar '21

19 Mar '21

commit f05ddef974dd967ffcd3d662fd11cd0e14b1a40d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 19 16:45:12 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+ar.po b/contents+ar.po index 8d91539621..ba09ca7f85 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -10601,7 +10601,7 @@ msgid "" msgstr "" "إذا كان هناك عدد كبير جدًا من الشكاوى الواردة ، فهناك العديد من الأساليب " "التي يمكنك اتباعها لتقليلها. أولاً ، يجب عليك اتباع النصائح الواردة في " -"[وثائق ترحيل Tor] (https://community.torproject.org/relay) ، مثل اختيار اسم " +"[وثائق ترحيل Tor](https://community.torproject.org/relay) ، مثل اختيار اسم " "مضيف وصفي أو الحصول على عنوان IP الخاص بك. إذا لم يفلح ذلك ، يمكنك تقليص " "السرعة المعلن عنها للترحيل ، باستخدام `MaxAdvertisedBandwidth` لجذب حركة " "مرور أقل من شبكة Tor. أخيرًا ، يمكنك تقليص سياسة الخروج الخاصة بك."

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 19 Mar '21

19 Mar '21

commit dc2f98b9c822e81669b77a47d5f6eb99a9cd6a53 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 19 16:15:11 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ar.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index e18f8bea60..8d91539621 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -9,7 +9,6 @@ # erinm, 2021 # Gus, 2021 # محيي الدين <tx99h4(a)hotmail.com>, 2021 -# Emma Peel, 2021 # Rima Sghaier, 2021 # Ahmed A., 2021 # Transifex Bot <>, 2021 @@ -17,6 +16,7 @@ # ButterflyOfFire, 2021 # Ahmed IB <mee.tbhole(a)gmail.com>, 2021 # NASI₿ <nomadweb(a)protonmail.ch>, 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -24,7 +24,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-18 19:45+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: NASI₿ <nomadweb(a)protonmail.ch>, 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -298,7 +298,7 @@ msgid "" "community-team) for more help." msgstr "" "إذا كان هذا يصف مجتمعك ، أو إذا لم تكن متأكدًا ، فيرجى [الاتصال بفريق " -"المجتمع لدينا] (https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-" +"المجتمع لدينا](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-" "community-team) للحصول على مزيد من المساعدة." #: https//community.torproject.org/onion-services/ @@ -6616,7 +6616,7 @@ msgid "" "bin/mailman/listinfo/tor-community-team) mailing list." msgstr "" "بعد الاجتماع ، قم بتنظيف المساحة وإزالة الملصقات وتحميل ملاحظاتك إلى القائمة" -" البريدية [فريق مجتمع Tor] (https://lists.torproject.org/cgi-" +" البريدية [فريق مجتمع Tor](https://lists.torproject.org/cgi-" "bin/mailman/listinfo/tor-community-team)." #: https//community.torproject.org/relay/setup/post-install/

1 0

[sbws/master] fix: v3bwfile: network means without relay type
by juga＠torproject.org 19 Mar '21

19 Mar '21

commit f93a11ca264e4c50f8cc17106084ae75c367a460 Author: juga0 <juga(a)riseup.net> Date: Fri Mar 19 13:37:17 2021 +0000 fix: v3bwfile: network means without relay type This reverts commit fc3d3b992ada601a6255f8a6889179abd4b7e55e and partialy reverts a82c26184097bea3ca405ae19773de7c4354a541. It was a mistake to think torflow was using the means by relay type, it actually sets the same networks means for all relay types. Closes #40080. --- sbws/globals.py | 8 -------- sbws/lib/scaling.py | 23 ----------------------- sbws/lib/v3bwfile.py | 25 +++++++++---------------- sbws/util/stem.py | 23 ----------------------- 4 files changed, 9 insertions(+), 70 deletions(-) diff --git a/sbws/globals.py b/sbws/globals.py index 16d8aa5..4136970 100644 --- a/sbws/globals.py +++ b/sbws/globals.py @@ -189,14 +189,6 @@ MAX_RECENT_PRIORITY_RELAY_COUNT = ( MAX_RECENT_PRIORITY_LIST_COUNT * MAX_RELAYS_PER_PRIORITY_LIST ) -# Used by util/stem.py -G = 0 -M = 1 -E = 2 -GE = 3 -# Used by lib/scaling.py to calculate network means by relay type -RELAY_TYPES = [G, M, E, GE] - def fail_hard(*a, **kw): """ Log something ... and then exit as fast as possible """ diff --git a/sbws/lib/scaling.py b/sbws/lib/scaling.py index 52b2cd2..1bd5af3 100644 --- a/sbws/lib/scaling.py +++ b/sbws/lib/scaling.py @@ -1,8 +1,5 @@ from statistics import mean -from sbws.globals import RELAY_TYPES -from sbws.util.stem import rs_relay_type - def bw_measurements_from_results(results): return [ @@ -30,23 +27,3 @@ def bw_filt(bw_measurements): if bws_gte_mean: return round(mean(bws_gte_mean)) return mu - - -def network_means_by_relay_type(bw_lines, router_statuses_d): - # Temporarily assign the type of relay to calculate network stream and - # filtered bandwidth by type - for line in bw_lines: - rs = None - if router_statuses_d: - rs = router_statuses_d.get(line.node_id.replace("$", ""), None) - line.set_relay_type(rs_relay_type(rs)) - - mu_type = muf_type = {} - for rt in RELAY_TYPES: - bw_lines_type = [line for line in bw_lines if line.relay_type == rt] - if len(bw_lines_type) > 0: - # Torflow does not round these values. - # Ensure they won't be 0 to avoid division by 0 Exception - mu_type[rt] = mean([line.bw_mean for line in bw_lines_type]) or 1 - muf_type[rt] = mean([line.bw_filt for line in bw_lines_type]) or 1 - return mu_type, muf_type diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 6010099..2784620 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -1068,12 +1068,6 @@ class V3BWLine(object): ) return bw_line_str - def set_relay_type(self, relay_type): - self.relay_type = relay_type - - def del_relay_type(self): - delattr(self, "relay_type") - class V3BWFile(object): """ @@ -1354,11 +1348,12 @@ class V3BWFile(object): """ log.info("Calculating relays' bandwidth using Torflow method.") bw_lines_tf = copy.deepcopy(bw_lines) - mu_type, muf_type = scaling.network_means_by_relay_type( - bw_lines_tf, router_statuses_d - ) - log.debug("mu %s", mu_type) - log.debug("muf %s", muf_type) + # mean (Torflow's strm_avg) + mu = mean([l.bw_mean for l in bw_lines]) + # filtered mean (Torflow's filt_avg) + muf = mean([l.bw_filt for l in bw_lines]) + log.debug("mu %s", mu) + log.debug("muf %s", muf) # Torflow's ``tot_net_bw``, sum of the scaled bandwidth for the relays # that are in the last consensus @@ -1423,12 +1418,10 @@ class V3BWFile(object): continue # Torflow's scaling - # relay_type is set in `network_means_by_relay_type` in the lines - # above - ratio_stream = l.bw_mean / mu_type[l.relay_type] - ratio_stream_filtered = l.bw_filt / muf_type[l.relay_type] - l.del_relay_type() + ratio_stream = l.bw_mean / mu + ratio_stream_filtered = l.bw_filt / muf ratio = max(ratio_stream, ratio_stream_filtered) + # Assign it to an attribute, so it's not lost before capping and # rounding l.bw = ratio * min_bandwidth diff --git a/sbws/util/stem.py b/sbws/util/stem.py index cecd5d7..191d1a8 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -7,7 +7,6 @@ import socks import stem.process from stem import ( ControllerError, - Flag, InvalidArguments, InvalidRequest, OperationFailed, @@ -21,13 +20,9 @@ from stem.control import Controller, Listener from sbws import settings from sbws.globals import ( - GE, TORRC_OPTIONS_CAN_FAIL, TORRC_RUNTIME_OPTIONS, TORRC_STARTING_POINT, - E, - G, - M, fail_hard, ) @@ -368,21 +363,3 @@ def is_torrc_starting_point_set(tor_controller): if not bad_options: log.info("Tor is correctly configured to work with sbws.") return bad_options - - -def rs_relay_type(rs): - # In torflow, the equivalent to the bw_lines is initialized to "", so when - # the relay is not in the previous consensus and it is not known which - # flags it has, it would return "Medium", as it's the fail case in - # Node.node_class(). - # It is not known if it is a bug, or a desired side effect that they relays - # not in the consensus will end up in the Middle class - if not rs: - return M - if Flag.EXIT in rs.flags and Flag.GUARD in rs.flags: - return GE - if Flag.GUARD in rs.flags: - return G - if Flag.EXIT in rs.flags: - return E - return M

1 0

[sbws/master] Merge branch 'maint-1.1'
by juga＠torproject.org 19 Mar '21

19 Mar '21

commit 7da8d72ebfca239d2781ac0076e2b8b9592441fa Merge: a016ab4 37d5c0a Author: juga0 <juga(a)riseup.net> Date: Fri Mar 19 15:52:59 2021 +0000 Merge branch 'maint-1.1' docs/source/differences.rst | 7 ------- docs/source/torflow_aggr.rst | 40 ++++++++++++---------------------------- sbws/globals.py | 8 -------- sbws/lib/scaling.py | 23 ----------------------- sbws/lib/v3bwfile.py | 25 +++++++++---------------- sbws/util/stem.py | 23 ----------------------- 6 files changed, 21 insertions(+), 105 deletions(-)

1 0