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

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 22 Oct '18

22 Oct '18

commit 656d63d7e7a0e497eb4a6b3cc88cd6bffafcac23 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 22 15:15:12 2018 +0000 Update translations for abouttor-homepage_completed --- fr/aboutTor.dtd | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/fr/aboutTor.dtd b/fr/aboutTor.dtd index 708e244a7..f373d7535 100644 --- a/fr/aboutTor.dtd +++ b/fr/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Obtenez les dernières nouvelles au sujet de Tor directement dans votre boîte de réception."> <!ENTITY aboutTor.newsletter.link_text "Inscrivez-vous aux nouvelles de Tor"> + +<!ENTITY aboutTor.donationBanner.line1 "Tor : l’union fait la force"> + +<!ENTITY aboutTor.donationBanner.line2a "L’anonymat est contagieux."> +<!ENTITY aboutTor.donationBanner.line2b "Promouvoir les droits universels de la personne."> +<!ENTITY aboutTor.donationBanner.line2c "Défendre la liberté."> +<!ENTITY aboutTor.donationBanner.line2d "Protéger la vie privée de millions de personnes."> +<!ENTITY aboutTor.donationBanner.line2e "Assurer la robustesse de Tor."> +<!ENTITY aboutTor.donationBanner.line2f "Nous avons besoin de votre soutien !"> + +<!ENTITY aboutTor.donationBanner.line3 "Faites un don aujourd’hui et Mozilla fera un don équivalent."> + +<!ENTITY aboutTor.donationBanner.buttonA "Faites un don maintenant"> +<!ENTITY aboutTor.donationBanner.buttonB "Comptez sur moi">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 22 Oct '18

22 Oct '18

commit 2617e37d36cba8ddde5b29d8a5ee9d192e372030 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 22 15:15:04 2018 +0000 Update translations for abouttor-homepage --- fr/aboutTor.dtd | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/fr/aboutTor.dtd b/fr/aboutTor.dtd index 52c4d062e..f373d7535 100644 --- a/fr/aboutTor.dtd +++ b/fr/aboutTor.dtd @@ -27,16 +27,16 @@ <!ENTITY aboutTor.newsletter.tagline "Obtenez les dernières nouvelles au sujet de Tor directement dans votre boîte de réception."> <!ENTITY aboutTor.newsletter.link_text "Inscrivez-vous aux nouvelles de Tor"> -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> +<!ENTITY aboutTor.donationBanner.line1 "Tor : l’union fait la force"> -<!ENTITY aboutTor.donationBanner.line2a "L’anonymat adore la compagnie"> -<!ENTITY aboutTor.donationBanner.line2b "Améliorer les droits de la personne."> -<!ENTITY aboutTor.donationBanner.line2c "Se lever pour la liberté."> -<!ENTITY aboutTor.donationBanner.line2d "Protéger la confidentialité de millions de personnes."> -<!ENTITY aboutTor.donationBanner.line2e "Garder Tor robuste."> -<!ENTITY aboutTor.donationBanner.line2f "On a besoin de votre soutien !"> +<!ENTITY aboutTor.donationBanner.line2a "L’anonymat est contagieux."> +<!ENTITY aboutTor.donationBanner.line2b "Promouvoir les droits universels de la personne."> +<!ENTITY aboutTor.donationBanner.line2c "Défendre la liberté."> +<!ENTITY aboutTor.donationBanner.line2d "Protéger la vie privée de millions de personnes."> +<!ENTITY aboutTor.donationBanner.line2e "Assurer la robustesse de Tor."> +<!ENTITY aboutTor.donationBanner.line2f "Nous avons besoin de votre soutien !"> -<!ENTITY aboutTor.donationBanner.line3 "Donnez aujourd'hui, et Mozilla recevra votre donation."> +<!ENTITY aboutTor.donationBanner.line3 "Faites un don aujourd’hui et Mozilla fera un don équivalent."> -<!ENTITY aboutTor.donationBanner.buttonA "Donnez dès maintenant"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> +<!ENTITY aboutTor.donationBanner.buttonA "Faites un don maintenant"> +<!ENTITY aboutTor.donationBanner.buttonB "Comptez sur moi">

1 0

[sbws/master] Stop removing results that are not away
by pastly＠torproject.org 22 Oct '18

22 Oct '18

commit 39c5e42a3517ea9d7732f2b01615d368f7b3bc3c Author: juga0 <juga(a)riseup.net> Date: Thu Oct 18 11:26:52 2018 +0000 Stop removing results that are not away from some other X secs. In #27338 it was implemented to do not include relays in the bandwidth files that does not have at least 2 measurements that are X secs away from each other. It was implemented removing any results that were not X secs away from each other, when all the results should be keep when there is at least one away from the others, as commented in #28061. --- sbws/lib/v3bwfile.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 4eecda6..ced0c20 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -5,6 +5,7 @@ import copy import logging import os +from itertools import combinations from statistics import median, mean from sbws import __version__ @@ -332,17 +333,12 @@ class V3BWLine(object): # "secs.", secs_away) if secs_away is None or len(results) < 2: return results - # the last one should be the most recent - results_away = [results[-1]] - # iterate over the rest of the results in reverse order - for r in reversed(results[:-1]): - if abs(results_away[0].time - r.time) > secs_away: - results_away.insert(0, r) - # if there is only 1 result, is the one inserted at the beginning, - # so there are no results away from each other - if len(results_away) < 2: - return None - return results_away + for a, b in combinations(results, 2): + if abs(a.time - b.time) > secs_away: + return results + # log.debug("Results are NOT away from each other in at least %ss: %s", + # secs_away, [unixts_to_isodt_str(r.time) for r in results]) + return None @staticmethod def results_recent_than(results, secs_recent=None):

1 0

[sbws/master] Add changelog entry about not removing results
by pastly＠torproject.org 22 Oct '18

22 Oct '18

commit 8f862024e011ea5a3905d5908229c6240f8f274b Author: juga0 <juga(a)riseup.net> Date: Thu Oct 18 11:35:07 2018 +0000 Add changelog entry about not removing results that are not away from some other X secs. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f58bfe3..78059c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Move ``examples/`` to ``docs/`` (#28040) - Number of results comparison and number of results away from each other are incorrect (#28041) +- Stop removing results that are not away from some other X secs (#28103) ## [0.8.0] - 2018-10-08

1 0

[sbws/master] Use secs-recent instead of data_period
by pastly＠torproject.org 22 Oct '18

22 Oct '18

commit 490017be388552f3851628762a6c4d81d7082be2 Author: juga0 <juga(a)riseup.net> Date: Thu Oct 18 11:44:02 2018 +0000 Use secs-recent instead of data_period when the arg is provided. Also, use list when filtering the results and add debugging lines --- sbws/core/generate.py | 8 ++++++-- sbws/lib/v3bwfile.py | 13 +++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/sbws/core/generate.py b/sbws/core/generate.py index 6a6226b..4965066 100644 --- a/sbws/core/generate.py +++ b/sbws/core/generate.py @@ -1,3 +1,5 @@ +from math import ceil + from sbws.globals import (fail_hard, SBWS_SCALE_CONSTANT, TORFLOW_SCALING, SBWS_SCALING, TORFLOW_BW_MARGIN, TORFLOW_ROUND_DIG, DAY_SECS, NUM_MIN_RESULTS) @@ -79,8 +81,10 @@ def main(args, conf): scaling_method = None else: scaling_method = TORFLOW_SCALING - - fresh_days = conf.getint('general', 'data_period') + if args.secs_recent: + fresh_days = ceil(args.secs_recent / 24 / 60 / 60) + else: + fresh_days = conf.getint('general', 'data_period') reset_bw_ipv4_changes = conf.getboolean('general', 'reset_bw_ipv4_changes') reset_bw_ipv6_changes = conf.getboolean('general', 'reset_bw_ipv6_changes') results = load_recent_results_in_datadir( diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 4eecda6..4861af4 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -286,10 +286,7 @@ class V3BWLine(object): return None results_recent = cls.results_recent_than(results_away, secs_recent) if not results_recent: - log.debug("There are no results that are more recent than {}" - " secs".format(secs_recent)) return None - # the most recent should be the last kwargs['desc_avg_bw_bs'] = \ results_recent[-1].relay_average_bandwidth kwargs['rtt'] = cls.rtt_from_results(results_recent) @@ -348,10 +345,14 @@ class V3BWLine(object): def results_recent_than(results, secs_recent=None): if secs_recent is None: return results - results_recent = filter( + results_recent = list(filter( lambda x: (now_unixts() - x.time) < secs_recent, - results) - return list(results_recent) + results)) + # if not results_recent: + # log.debug("Results are NOT more recent than %ss: %s", + # secs_recent, + # [unixts_to_isodt_str(r.time) for r in results]) + return results_recent @staticmethod def bw_bs_median_from_results(results):

1 0

[sbws/master] Add test to check results_away_each_other
by pastly＠torproject.org 22 Oct '18

22 Oct '18

commit c14cefd32a6e049d884a64883d49c8a4ae7bc4fe Author: juga0 <juga(a)riseup.net> Date: Thu Oct 18 11:13:54 2018 +0000 Add test to check results_away_each_other When there's at least one result that is X secs away from any other, all the results should be keep. --- tests/unit/lib/data/results_away.txt | 7 +++++++ tests/unit/lib/test_v3bwfile.py | 30 +++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/tests/unit/lib/data/results_away.txt b/tests/unit/lib/data/results_away.txt new file mode 100644 index 0000000..8974e49 --- /dev/null +++ b/tests/unit/lib/data/results_away.txt @@ -0,0 +1,7 @@ +{"version": 4, "time": 1523887747, "circ": ["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"], "type": "success", "rtts": [0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 0.4635589122772217], "fingerprint": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, "duration": 6.1014368534088135}, {"amount": 590009, "duration": 8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192}, {"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, "duration": 5.779450178146362}], "dest_url": "http://y.z", "nickname": "A", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth": 1000000000, "relay_observed_bandwidth": 524288} +{"version": 4, "time": 1523974147, "circ": ["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"], "type": "error-stream", "msg": "Something bad happened while measuring bandwidth", "fingerprint": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "scanner": "IDidntEditTheSBWSConfig", "dest_url": "http://y.z", "nickname": "A", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s"} +{"version": 4, "time": 1523975587, "circ": ["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"], "type": "success", "rtts": [0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 0.4635589122772217], "fingerprint": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, "duration": 6.1014368534088135}, {"amount": 590009, "duration": 8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192}, {"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, "duration": 5.779450178146362}], "dest_url": "http://y.z", "nickname": "A", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth": 1000000000, "relay_observed_bandwidth": 524288} +{"version": 4, "time": 1524019507, "circ": ["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"], "type": "success", "rtts": [0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 0.4635589122772217], "fingerprint": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, "duration": 6.1014368534088135}, {"amount": 590009, "duration": 8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192}, {"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, "duration": 5.779450178146362}], "dest_url": "http://y.z", "nickname": "A", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth": 1000000000, "relay_observed_bandwidth": 524288} +{"version": 4, "time": 1523975587, "circ": ["BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB", "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"], "type": "success", "rtts": [0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 0.4635589122772217], "fingerprint": "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB", "scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, "duration": 6.1014368534088135}, {"amount": 590009, "duration": 8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192}, {"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, "duration": 5.779450178146362}], "dest_url": "http://y.z", "nickname": "B", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth": 1000000000, "relay_observed_bandwidth": 524288} +{"version": 4, "time": 1524019507, "circ": ["BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB", "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"], "type": "success", "rtts": [0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 0.4635589122772217], "fingerprint": "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB", "scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, "duration": 6.1014368534088135}, {"amount": 590009, "duration": 8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192}, {"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, "duration": 5.779450178146362}], "dest_url": "http://y.z", "nickname": "B", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth": 1000000000, "relay_observed_bandwidth": 524288} +{"version": 4, "time": 1524019507, "circ": ["CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC", "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD"], "type": "success", "rtts": [0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 0.4635589122772217], "fingerprint": "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC", "scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, "duration": 6.1014368534088135}, {"amount": 590009, "duration": 8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192}, {"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, "duration": 5.779450178146362}], "dest_url": "http://y.z", "nickname": "C", "address": "111.111.111.111", "master_key_ed25519": "g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth": 1000000000, "relay_observed_bandwidth": 524288} diff --git a/tests/unit/lib/test_v3bwfile.py b/tests/unit/lib/test_v3bwfile.py index 15a6779..a53d5db 100644 --- a/tests/unit/lib/test_v3bwfile.py +++ b/tests/unit/lib/test_v3bwfile.py @@ -5,7 +5,7 @@ import os.path from sbws import __version__ as version from sbws.globals import SPEC_VERSION, SBWS_SCALING, TORFLOW_SCALING -from sbws.lib.resultdump import Result, load_result_file +from sbws.lib.resultdump import Result, load_result_file, ResultSuccess from sbws.lib.v3bwfile import (V3BWHeader, V3BWLine, TERMINATOR, LINE_SEP, KEYVALUE_SEP_V110, num_results_of_type, V3BWFile) @@ -154,3 +154,31 @@ def test_torflow_scale(datadir): v3bwfile = V3BWFile.from_results(results, scaling_method=TORFLOW_SCALING, torflow_cap=1, torflow_round_digs=0) assert v3bwfile.bw_lines[0].bw == 524 + + +def test_results_away_each_other(datadir): + min_num = 2 + secs_away = 86400 # 1d + results = load_result_file(str(datadir.join("results_away.txt"))) + # A has 4 results, 3 are success, 2 are 1 day away, 1 is 12h away + values = results["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"] + success_results = [r for r in values if isinstance(r, ResultSuccess)] + assert len(success_results) >= min_num + results_away = V3BWLine.results_away_each_other(success_results, secs_away) + assert len(results_away) == 3 + # B has 2 results, 12h away from each other + values = results["BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"] + success_results = [r for r in values if isinstance(r, ResultSuccess)] + assert len(success_results) >= min_num + results_away = V3BWLine.results_away_each_other(success_results, secs_away) + assert results_away is None + secs_away = 43200 # 12h + values = results["BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"] + success_results = [r for r in values if isinstance(r, ResultSuccess)] + assert len(success_results) >= min_num + results_away = V3BWLine.results_away_each_other(success_results, secs_away) + assert len(results_away) == 2 + # C has 1 result + values = results["CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"] + success_results = [r for r in values if isinstance(r, ResultSuccess)] + assert len(success_results) < min_num

1 0

[sbws/master] Add debugging lines that show filtered results
by pastly＠torproject.org 22 Oct '18

22 Oct '18

commit 6817580a88fb6096ee4026a209388bd35e9788f4 Author: juga0 <juga(a)riseup.net> Date: Thu Oct 18 11:32:39 2018 +0000 Add debugging lines that show filtered results --- sbws/lib/v3bwfile.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index ced0c20..8f1e24a 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -267,6 +267,7 @@ class V3BWLine(object): bw = data (Bytes) / time (seconds) """ success_results = [r for r in results if isinstance(r, ResultSuccess)] + # log.debug("Len success_results %s", len(success_results)) node_id = '$' + results[0].fingerprint kwargs = dict() kwargs['nick'] = results[0].nickname @@ -282,9 +283,9 @@ class V3BWLine(object): results_away = \ cls.results_away_each_other(success_results, secs_away) if not results_away: - log.debug("There are no results with relays' results away from" - " each other {}".format(secs_away)) return None + # log.debug("Results away from each other: %s", + # [unixts_to_isodt_str(r.time) for r in results_away]) results_recent = cls.results_recent_than(results_away, secs_recent) if not results_recent: log.debug("There are no results that are more recent than {}" @@ -471,6 +472,7 @@ class V3BWFile(object): header = V3BWHeader.from_results(results, state_fpath) bw_lines_raw = [] for fp, values in results.items(): + # log.debug("Relay fp %s", fp) line = V3BWLine.from_results(values, secs_recent, secs_away, min_num) if line is not None:

1 0

[sbws/master] Add chagelog entry about use secs-away
by pastly＠torproject.org 22 Oct '18

22 Oct '18

commit 52e222158bce106572b1a7c85ccdb9499c821076 Author: juga0 <juga(a)riseup.net> Date: Thu Oct 18 12:14:45 2018 +0000 Add chagelog entry about use secs-away --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f58bfe3..9464985 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Move ``examples/`` to ``docs/`` (#28040) - Number of results comparison and number of results away from each other are incorrect (#28041) +- Use secs-away when provided instead of data_period (#28105) ## [0.8.0] - 2018-10-08

1 0

[sbws/master] Merge remote-tracking branch 'juga/ticket28105_fix_recent_results'
by pastly＠torproject.org 22 Oct '18

22 Oct '18

commit 73c01a476080799fbf57ae6503b16153ff0de4b1 Merge: 8f86202 52e2221 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Mon Oct 22 09:43:44 2018 -0400 Merge remote-tracking branch 'juga/ticket28105_fix_recent_results' CHANGELOG.md | 1 + sbws/core/generate.py | 8 ++++++-- sbws/lib/v3bwfile.py | 13 +++++++------ 3 files changed, 14 insertions(+), 8 deletions(-) diff --cc CHANGELOG.md index 78059c3,9464985..90da685 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@@ -16,7 -16,7 +16,8 @@@ and this project adheres to [Semantic V - Move ``examples/`` to ``docs/`` (#28040) - Number of results comparison and number of results away from each other are incorrect (#28041) +- Stop removing results that are not away from some other X secs (#28103) + - Use secs-away when provided instead of data_period (#28105) ## [0.8.0] - 2018-10-08 diff --cc sbws/lib/v3bwfile.py index 8f1e24a,4861af4..8d0e193 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@@ -283,15 -281,12 +283,12 @@@ class V3BWLine(object) results_away = \ cls.results_away_each_other(success_results, secs_away) if not results_away: - log.debug("There are no results with relays' results away from" - " each other {}".format(secs_away)) return None + # log.debug("Results away from each other: %s", + # [unixts_to_isodt_str(r.time) for r in results_away]) results_recent = cls.results_recent_than(results_away, secs_recent) if not results_recent: - log.debug("There are no results that are more recent than {}" - " secs".format(secs_recent)) return None - # the most recent should be the last kwargs['desc_avg_bw_bs'] = \ results_recent[-1].relay_average_bandwidth kwargs['rtt'] = cls.rtt_from_results(results_recent)

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 22 Oct '18

22 Oct '18

commit dbb4a35cb0358f1e7c52f9ab54fc2912ba8bc565 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 22 13:15:25 2018 +0000 Update translations for donatepages-messagespot --- locale/it/LC_MESSAGES/messages.po | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po index 811a3442a..8b7860096 100644 --- a/locale/it/LC_MESSAGES/messages.po +++ b/locale/it/LC_MESSAGES/messages.po @@ -792,27 +792,32 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:94 msgid "Who uses Tor?" -msgstr "" +msgstr "Chi usa Tor?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:98 msgid "" "The vast majority of Tor users are ordinary people who want control of their" " privacy online or people whose internet use is censored." msgstr "" +"La stragrande maggioranza degli utenti Tor sono persone comuni che vogliono " +"avere il controllo della loro privacy online o persone il cui uso di " +"Internet viene censurato." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:100 msgid "" "Other Tor users are journalists, human rights defenders, domestic violence " "survivors, policymakers, diplomats, and academic and research institutions." msgstr "" +"Altri utenti Tor sono giornalisti, difensori dei diritti umani, vittime di " +"violenza domestica, politici, diplomatici e istituti accademici di ricerca." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:106 msgid "Can anyone use Tor?" -msgstr "" +msgstr "Chiunque può usare Tor?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:110 msgid "Yes! Tor is free, and anyone can use it." -msgstr "" +msgstr "Sì! Tor è gratuito e chiunque può usarlo." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:112 msgid "" @@ -820,6 +825,9 @@ msgid "" "href=\"https://www.torproject.org/projects/torbrowser.html.en\"><span " "class=\"links\">download Tor Browser</span></a>." msgstr "" +"Per iniziare, dovrai <a class=\"hyperlinks\" target=\"_blank\" " +"href=\"https://www.torproject.org/projects/torbrowser.html.en\"><span " +"class=\"links\">scaricare Tor Browser</span></a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:114 msgid "" @@ -831,6 +839,13 @@ msgid "" "OS X</a> and <a class=\"hyperlinks links\" target=\"_blank\" " "href=\"https://www.torproject.org/projects/torbrowser.html.en#linux\">Linux</a>." msgstr "" +"Forniamo istruzioni per scaricare per <a class=\"hyperlinks links\" " +"target=\"_blank\" " +"href=\"https://www.torproject.org/projects/torbrowser.html.en#windows\">Windows</a>," +" <a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.torproject.org/projects/torbrowser.html.en#macosx\">Mac " +"OS X</a> e <a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.torproject.org/projects/torbrowser.html.en#linux\">Linux</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:120 msgid "What kinds of people support Tor?"

1 0