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

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 26 Aug '20

26 Aug '20

commit 60bfc6808a68975c125bc7156dc563d5bdc261c8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 26 18:45:09 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ar.po | 62 +++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 51 insertions(+), 11 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index 2b7f9f92ce..f276409b3b 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -1328,6 +1328,9 @@ msgid "" "of people (3-5 suggested to start) interested in helping with the various " "activities required for running relays." msgstr "" +"لبدء شريك Torservers ، فإن الشيء الأكثر أهمية هو أن يكون لديك مجموعة من " +"الأشخاص (3-5 مقترح للبدء) مهتمين بالمساعدة في الأنشطة المختلفة المطلوبة " +"لتشغيل المرحلات." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1406,7 +1409,7 @@ msgstr "من المهم للغاية الحفاظ على علاقات جيدة #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) msgid "## At your university" -msgstr "" +msgstr "## في جامعتك" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1414,6 +1417,8 @@ msgid "" "Many computer science departments, university libraries, and individual " "students and faculty run relays from university networks." msgstr "" +"تقوم العديد من أقسام علوم الكمبيوتر والمكتبات الجامعية والطلاب وأعضاء هيئة " +"التدريس بتشغيل عمليات ترحيل من شبكات الجامعة." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1434,11 +1439,14 @@ msgid "" "network, check out EFF's resources: [Tor on " "campus](https://www.eff.org/torchallenge/tor-on-campus.html)." msgstr "" +"لمعرفة المزيد حول كيفية الحصول على دعم لترحيل على شبكة جامعتك ، تحقق من " +"موارد EFF: [Tor on campus] (https://www.eff.org/torchallenge/tor-on-" +"campus.html)." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) msgid "## At your company or organization" -msgstr "" +msgstr "## في شركتك أو مؤسستك" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1458,6 +1466,11 @@ msgid "" "Access](https://www.privateinternetaccess.com/), [Boing " "Boing](https://boingboing.net/) and OmuraVPN." msgstr "" +"تتضمن بعض الشركات التي تشغل المرحلات [Brass Horn Communications] " +"(https://brasshorncommunities.uk/) و [Quintex Alliance Consulting] " +"(https://www.quintex.com/) و [الوصول إلى الإنترنت الخاص] (https: // www " +".privateinternetaccess.com /) و [Boing Boing] (https://boingboing.net/) و " +"OmuraVPN." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1467,11 +1480,15 @@ msgid "" "Digitales](https://tor.derechosdigitales.org), [Enjambre " "Digital](https://tor.enjambre.net/) and Lebanon Libraries in New Hampshire." msgstr "" +"تتضمن بعض المنظمات التي تشغل مرحلات Tor Digital Courage و [Access Now] " +"(https://www.accessnow.org/) و [Derechos Digitales] " +"(https://tor.derechosdigitales.org) و [Enjambre Digital] (https: / " +"/tor.enjambre.net/) ومكتبات لبنان في نيو هامبشاير." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) msgid "# Bad relays" -msgstr "" +msgstr "# مرحلات سيئة" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1480,6 +1497,8 @@ msgid "" "users' connections. This can be either through maliciousness or " "misconfiguration." msgstr "" +"الترحيل السيئ هو إما أنه لا يعمل بشكل صحيح أو يعبث باتصالات مستخدمينا. يمكن " +"أن يكون هذا إما عن طريق الخبث أو التهيئة الخاطئة." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1488,16 +1507,19 @@ msgid "" " all your help and vigilance! Learn how you can report [bad relays](bad-" "relays)." msgstr "" +"تم اكتشاف العديد من المرحلات السيئة بفضل مجتمعنا الأوسع ، شكرًا جزيلاً على " +"كل ما تبذلونه من مساعدة ويقظة! تعرف على كيفية الإبلاغ عن [مرحلات سيئة] (bad-" +"relays)." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) msgid "# Other resources" -msgstr "" +msgstr "# مصادر أخرى" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) msgid "Congratulations, you're officially a Tor relay operator! What now?" -msgstr "" +msgstr "تهانينا ، أنت رسميًا مشغل Tor للترحيل! ماذا الان؟" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1506,6 +1528,9 @@ msgid "" "[Relay Search](https://metrics.torproject.org/rs.html) (your relay will " "appear on \"Relay Search\" about 3 hours after you started it)." msgstr "" +"* يمكنك التحقق من إحصائيات حركة المرور والإحصائيات الأخرى الخاصة بالترحيل " +"على [بحث الترحيل] (https://metrics.torproject.org/rs.html) (سيظهر الترحيل " +"الخاص بك في \"بحث الترحيل\" بعد حوالي 3 ساعات من بدئه )." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1513,6 +1538,8 @@ msgid "" "* There is also more info about running a relay at the [Tor " "FAQ](https://2019.www.torproject.org/docs/faq.html.en#HowDoIDecide)." msgstr "" +"* هناك أيضًا المزيد من المعلومات حول تشغيل الترحيل في [الأسئلة الشائعة حول " +"Tor] (https://2019.www.torproject.org/docs/faq.html.en#HowDoIDecide)" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1521,23 +1548,26 @@ msgid "" " your swag](swag). It's our way of saying thanks for defending privacy and " "free speech online." msgstr "" +"* والأهم من ذلك ، تأكد من إرسال بريد إلكتروني إلى tshirt(a)torproject.org و " +"[ادعي غنيمة] (swag). إنها طريقتنا في التعبير عن الشكر للدفاع عن الخصوصية " +"وحرية التعبير عبر الإنترنت." #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.title) msgid "Technical considerations" -msgstr "" +msgstr "الاعتبارات الفنية" #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.subtitle) msgid "" "How to choose a good hosting provider, what's an AS and Operating System " "diversity." -msgstr "" +msgstr "كيفية اختيار مزود استضافة جيد ، ما هو تنوع AS ونظام التشغيل." #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) msgid "# Choosing a hosting provider" -msgstr "" +msgstr "# اختيار مزود الاستضافة" #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) @@ -1546,6 +1576,8 @@ msgid "" "directions) and a physical piece of computer hardware is the best way to run" " a relay." msgstr "" +"يعد الوصول إلى اتصال إنترنت عالي السرعة (> = 100 ميغابت / ثانية في كلا " +"الاتجاهين) وقطعة مادية من أجهزة الكمبيوتر أفضل طريقة لتشغيل مرحل." #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) @@ -1553,6 +1585,8 @@ msgid "" "Having full control over the hardware and connection gives you a more " "controllable and (if done correctly) secure environment." msgstr "" +"يمنحك التحكم الكامل في الأجهزة والاتصال بيئة آمنة (إذا تم إجراؤها بشكل " +"صحيح)." #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) @@ -1560,11 +1594,13 @@ msgid "" "You can host your own physical hardware at home (do NOT run a Tor exit relay" " from your home) or in a data center." msgstr "" +"يمكنك استضافة أجهزتك المادية في المنزل (لا تقم بتشغيل مرحل خروج Tor من " +"منزلك) أو في مركز البيانات." #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) msgid "Sometimes this is referred to as installing the relay on \"bare metal.\"" -msgstr "" +msgstr "في بعض الأحيان يشار إلى هذا بتثبيت التتابع على \"المعدن\"." #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) @@ -1572,6 +1608,8 @@ msgid "" "If you do not own physical hardware, you could run a relay on a rented " "dedicated server or virtual private server (VPS)." msgstr "" +"إذا لم تكن تمتلك أجهزة مادية ، فيمكنك تشغيل ترحيل على خادم مخصص مستأجر أو " +"خادم خاص افتراضي (VPS)." #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) @@ -1579,18 +1617,20 @@ msgid "" "This can cost anywhere between $3.00/month and thousands per month, " "depending on your provider, hardware configuration, and bandwidth usage." msgstr "" +"يمكن أن يكلف هذا ما بين 3.00 دولارات شهريًا والآلاف شهريًا ، اعتمادًا على " +"مزود الخدمة وتكوين الأجهزة واستخدام النطاق الترددي." #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) msgid "Many VPS providers will not allow you to run exit relays." -msgstr "" +msgstr "لن يسمح لك العديد من مزودي VPS بتشغيل مرحلات الخروج." #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) msgid "" "You must follow the VPS provider's terms of service, or risk having your " "account disabled." -msgstr "" +msgstr "يجب عليك اتباع شروط خدمة مزودي VPS ، أو المخاطرة بتعطيل حسابك." #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 26 Aug '20

26 Aug '20

commit d397b9e906fda0a61801ef8d66f00556596c06a0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 26 18:15:11 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ar.po | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 5 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index 5619488466..2b7f9f92ce 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -1177,6 +1177,11 @@ msgid "" "wiki](https://www.noisebridge.net/wiki/Noisebridge_Tor/FBI) for additional " "legal resources." msgstr "" +"تجيب [الأسئلة الشائعة حول EFF Tor القانونية] (/ relay / community-resources " +"/ eff-tor-legal-faq) على العديد من الأسئلة الشائعة حول عملية الترحيل " +"والقانون. نحب أيضًا [ويكي Noisebridge] " +"(https://www.noisebridge.net/wiki/Noisebridge_Tor/FBI) للحصول على موارد " +"قانونية إضافية." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1186,6 +1191,9 @@ msgid "" "operators have been harassed, or if you're the only exit relay operator in " "your region." msgstr "" +"بشكل عام ، من الجيد التشاور مع محام قبل اتخاذ قرار بتشغيل مرحل خروج ، خاصة " +"إذا كنت تعيش في مكان تعرض فيه مشغلو ترحيل الخروج للمضايقة ، أو إذا كنت " +"المشغل الوحيد لترحيل الخروج في منطقتك." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1196,16 +1204,20 @@ msgid "" "EFF](https://www.eff.org/about/contact) and see if they can help connect " "you." msgstr "" +"تواصل مع منظمة الحقوق الرقمية المحلية لمعرفة ما إذا كانت لديها توصيات بشأن " +"المساعدة القانونية ، وإذا لم تكن متأكدًا من المنظمات التي تعمل في منطقتك ، " +"[اكتب إلى EFF] (https://www.eff.org/ about / contact) ومعرفة ما إذا كان " +"بإمكانهم المساعدة في توصيلك." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) msgid "Also see the [Tor Exit Guidelines](tor-exit-guidelines)." -msgstr "" +msgstr "راجع أيضًا [إرشادات خروج Tor] (توجيهات Tor الخروج)." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) msgid "# Responding to abuse complaints" -msgstr "" +msgstr "# الرد على شكاوى الإساءة" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1214,6 +1226,9 @@ msgid "" " one of many templates that Tor has created: [Tor Abuse Templates](tor-" "abuse-templates)." msgstr "" +"يمكن للمشغلين تجميع استجابات قوالب شكوى إساءة الاستخدام الخاصة بهم من أحد " +"القوالب العديدة التي أنشأها Tor: [Tor Abuse Templates] (tor-abuse-" +"Templates)." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1222,6 +1237,9 @@ msgid "" "within 24 hours). If the hoster gets annoyed by the amount of abuse you can" " reduce the amount of ports allowed in your exit policy." msgstr "" +"من المهم الرد على شكاوى الإساءة في الوقت المناسب (عادة في غضون 24 ساعة). إذا" +" انزعج المضيف من مقدار الإساءة ، يمكنك تقليل عدد المنافذ المسموح بها في " +"سياسة الخروج الخاصة بك." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1229,11 +1247,13 @@ msgid "" "Please document your experience with new hosters on the following page: " "[GoodBadISPs](good-bad-isps)" msgstr "" +"يرجى توثيق تجربتك مع المضيفين الجدد في الصفحة التالية: [GoodBadISPs] (جيد - " +"سيء - isps)" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) msgid "Other docs we like:" -msgstr "" +msgstr "مستندات أخرى نحبها:" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1242,6 +1262,9 @@ msgid "" "exit relay: [What happened when we got subpoenaed over our Tor exit " "node](https://boingboing.net/2015/08/04/what-happened-when-the-fbi-sub.html)" msgstr "" +"* رسالة استخدمها Boing Boing للرد على أمر استدعاء فيدرالي أمريكي حول ترحيل " +"الخروج: [ماذا حدث عندما تم استدعاءنا عبر عقدة خروج Tor الخاصة بنا] " +"(https://boingboing.net/2015/08/04/what-happened- when-the-fbi-sub.html)" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1252,11 +1275,15 @@ msgid "" "Template](https://github.com/coldhakca/abuse-" "templates/blob/master/generic.template)." msgstr "" +"* نماذج الرد على إساءة الاستخدام من Coldhak ، وهي مؤسسة في كندا تدير عدة " +"مرحلات: [نموذج DMCA] (https://github.com/coldhakca/abuse-" +"templates/blob/master/dmca.template) ، [Generic Abuse Template] ( " +"https://github.com/coldhakca/abuse-templates/blob/master/generic.template)" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) msgid "# Running a relay with other people" -msgstr "" +msgstr "# تشغيل تتابع مع أشخاص آخرين" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1265,11 +1292,14 @@ msgid "" "university department, your employer or institution, or an organization like" " [Torservers.net](https://torservers.net) to run a relay." msgstr "" +"تشغيل المرحلات أكثر متعة مع الآخرين! يمكنك العمل مع قسم جامعتك أو صاحب العمل" +" أو المؤسسة أو مؤسسة مثل [Torservers.net] (https://torservers.net) لتشغيل " +"الترحيل." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) msgid "## Torservers.net" -msgstr "" +msgstr "## Torservers.net" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1277,6 +1307,8 @@ msgid "" "Torservers is an independent, global network of organizations that help the " "Tor network by running high bandwidth Tor relays." msgstr "" +"Torservers هي شبكة عالمية مستقلة من المنظمات التي تساعد شبكة Tor من خلال " +"تشغيل مرحلات Tor ذات النطاق الترددي العالي." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1285,6 +1317,9 @@ msgid "" "Tor relay community, and can help you connect with dedicated relay operators" " around the world for solidarity and support." msgstr "" +"أن تصبح شريكًا في Torservers هي طريقة جيدة للمشاركة بشكل أكبر في مجتمع Tor " +"relay ، ويمكن أن تساعدك على التواصل مع مشغلي الترحيل المخصصين حول العالم " +"للتضامن والدعم." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body)

1 0

[tor/master] Merge branch 'tor-gitlab/mr/135'
by dgoulet＠torproject.org 26 Aug '20

26 Aug '20

commit a6a97236fcb7733272be57cbf9185dfbf93db947 Merge: d4f3cfe99a 90707c9264 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Aug 26 11:04:53 2020 -0400 Merge branch 'tor-gitlab/mr/135' src/feature/client/bridges.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/master] Even argument spacing for some functions in feature/client/bridges.c
by dgoulet＠torproject.org 26 Aug '20

26 Aug '20

commit 90707c92642b0b91482f00a287fdda04450c8055 Author: Neel Chauhan <neel(a)neelc.org> Date: Tue Aug 25 09:16:58 2020 -0400 Even argument spacing for some functions in feature/client/bridges.c --- src/feature/client/bridges.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/feature/client/bridges.c b/src/feature/client/bridges.c index cc17e8fa67..59f79219cf 100644 --- a/src/feature/client/bridges.c +++ b/src/feature/client/bridges.c @@ -249,8 +249,8 @@ get_configured_bridge_by_exact_addr_port_digest(const tor_addr_t *addr, * address/port matches only. */ int addr_is_a_configured_bridge(const tor_addr_t *addr, - uint16_t port, - const char *digest) + uint16_t port, + const char *digest) { tor_assert(addr); return get_configured_bridge_by_addr_port_digest(addr, port, digest) ? 1 : 0; @@ -596,7 +596,7 @@ find_transport_name_by_bridge_addrport(const tor_addr_t *addr, uint16_t port) */ int get_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port, - const transport_t **transport) + const transport_t **transport) { *transport = NULL; if (!bridge_list)

1 0

[sbws/master] fix: v3bwfile: Take all measurements when IP changes
by juga＠torproject.org 26 Aug '20

26 Aug '20

commit f82ea6a6ac95d2eb61211b4ca7af84a52ce55e13 Author: juga0 <juga(a)riseup.net> Date: Tue Jun 23 17:35:39 2020 +0000 fix: v3bwfile: Take all measurements when IP changes Previously, when a relay changes IP, only the measurements with the last IP were considered. Relays with dynamic IP could get unmeasured that way. Now, all the measurements are considered. Closes: #33832. Bugfix 0.5.0. --- sbws/config.default.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sbws/config.default.ini b/sbws/config.default.ini index 81b4b07..f159b68 100644 --- a/sbws/config.default.ini +++ b/sbws/config.default.ini @@ -30,7 +30,7 @@ circuit_timeout = 10 # address changes. If it changes, we only consider results for the relay that # we obtained while the relay was located at its most recent IP address. # This is NOT implemented for IPv6. -reset_bw_ipv4_changes = on +reset_bw_ipv4_changes = off reset_bw_ipv6_changes = off [scanner] @@ -123,4 +123,3 @@ to_stdout_format = ${format} to_syslog_format = %(module)s[%(process)s]: <%(levelname)s> %(message)s # verbose formatter useful for debugging to_file_format = %(asctime)s %(levelname)s %(threadName)s %(filename)s:%(lineno)s - %(funcName)s - %(message)s -

1 0

[sbws/master] Merge remote-tracking branch 'gitlab/merge-requests/28' into maint-1.1
by juga＠torproject.org 26 Aug '20

26 Aug '20

commit 4106adefb1ac52ddb4b88dc381122224500961b1 Merge: 4bed2ce bb2a3c6 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Aug 22 13:06:46 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/28' into maint-1.1 docs/source/contributing.rst | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)

1 0

[sbws/master] fix: v3bwfile: Avoid statistics without data
by juga＠torproject.org 26 Aug '20

26 Aug '20

commit 2924e440373341abfb1548c61db3608fb7eebfad Author: juga0 <juga(a)riseup.net> Date: Tue Aug 11 16:02:01 2020 +0000 fix: v3bwfile: Avoid statistics without data If mean or median argument is empty, they throw an exception. This can happen when the scanner has stopped and the result is stored as successful without any downloads. Closes: #40012 --- sbws/lib/scaling.py | 10 +++++++--- sbws/lib/v3bwfile.py | 14 ++++++++++---- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/sbws/lib/scaling.py b/sbws/lib/scaling.py index 0fc3f84..079f36b 100644 --- a/sbws/lib/scaling.py +++ b/sbws/lib/scaling.py @@ -14,6 +14,10 @@ def bw_filt(bw_measurements): It is the equivalent to Torflow's ``filt_sbw``. ``mu`` in this function is the equivalent to Torflow's ``sbw``. """ - mu = mean(bw_measurements) - bws_gte_mean = filter(lambda bw: bw >= mu, bw_measurements) - return mean(bws_gte_mean) + mu = 1 + if bw_measurements: + mu = mean(bw_measurements) + bws_gte_mean = list(filter(lambda bw: bw >= mu, bw_measurements)) + if bws_gte_mean: + return mean(bws_gte_mean) + return 1 diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 13b202c..45563b6 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -869,13 +869,19 @@ class V3BWLine(object): @staticmethod def bw_median_from_results(results): - return max(round(median([dl['amount'] / dl['duration'] - for r in results for dl in r.downloads])), 1) + bws = [dl['amount'] / dl['duration'] + for r in results for dl in r.downloads] + if bws: + return max(round(median(bws)), 1) + return 1 @staticmethod def bw_mean_from_results(results): - return max(round(mean([dl['amount'] / dl['duration'] - for r in results for dl in r.downloads])), 1) + bws = [dl['amount'] / dl['duration'] + for r in results for dl in r.downloads] + if bws: + return max(round(mean(bws)), 1) + return 1 @staticmethod def last_time_from_results(results):

1 0

[sbws/master] fix: doc: Clarify branch to use when contributing
by juga＠torproject.org 26 Aug '20

26 Aug '20

commit ed835c416a2c75c055914e88c2daa7654b7df934 Author: juga0 <juga(a)riseup.net> Date: Tue Aug 11 15:45:03 2020 +0000 fix: doc: Clarify branch to use when contributing Closes: #33473 --- docs/source/contributing.rst | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/source/contributing.rst b/docs/source/contributing.rst index 0d41689..60602ad 100644 --- a/docs/source/contributing.rst +++ b/docs/source/contributing.rst @@ -51,9 +51,14 @@ Steps to create a MR Use ``pip install -e <>`` 5. If needed install the documentation and build it as explained in ./DOCUMENTATION.rst -6. Create a new branch, named ``ticketXXX``. - Optionally, name it with a string explaining what it does, - ie ``ticketXXX_contributing`` +6. Create a new feature branch. + If the issue solves a bug, base the branch on the latest maintained version, + eg. ``maint-1.1`` and name it with the name of the base branch plus + ``_bugXXX``, where `XXX` is the number of the issue. + If the issue is a new feature, base the branch on the `master` branch and + name it ``ticketXXX``. + Optionally, the last part of the branch name can be any string, eg. + ``maint-1.1_bugXXX_contributing``. 7. Write code (:ref:`codestyle-ref`), tests, documentation, extra files (:ref:`extrafiles-ref`), commit (:ref:`commits-ref`), etc. 8. Ensure tests pass (./TESTING.rst).

1 0

[sbws/master] fix: doc: No need to use Travis anymore
by juga＠torproject.org 26 Aug '20

26 Aug '20

commit bb2a3c6119569d76237a0074c70514ad599dd82b Author: juga0 <juga(a)riseup.net> Date: Tue Aug 11 15:47:05 2020 +0000 fix: doc: No need to use Travis anymore --- docs/source/contributing.rst | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/docs/source/contributing.rst b/docs/source/contributing.rst index 60602ad..c17aa4a 100644 --- a/docs/source/contributing.rst +++ b/docs/source/contributing.rst @@ -63,19 +63,12 @@ Steps to create a MR extra files (:ref:`extrafiles-ref`), commit (:ref:`commits-ref`), etc. 8. Ensure tests pass (./TESTING.rst). 9. Push your branch to your Gitlab repository. - -We are temporally using Github Travis to ensure tests pass. For this: - -10. Clone ``sbws`` via the Github web interface: - https://github.com/torproject/sbws -11. Push your branch to your Github repository. - -12. If you have an account in Travis, you can see whether it pass the tests in - Github and at https://travis-ci.org/youruser/sbws/ +10. Ensure the CI tests are passing + (https://gitlab.torproject.org/tpo/network-health/sbws/-/pipelines) Finally: -13. Create a MR from your branch at +11. Create a MR from your branch at https://gitlab.torproject.org/tpo/network-health/sbws

1 0

[sbws/master] Merge remote-tracking branch 'gitlab/merge-requests/16' into maint-1.1
by juga＠torproject.org 26 Aug '20

26 Aug '20

commit 4b29a493123eeae886ebecbc07b4d3824e99c38f Merge: 685c9e7 f82ea6a Author: Georg Koppen <gk(a)torproject.org> Date: Sun Aug 23 19:15:08 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/16' into maint-1.1 sbws/config.default.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

1 0