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

[sbws/master] tests: add bandwidth and is_unmeasured to results
by juga＠torproject.org 03 Dec '18

03 Dec '18

commit d5e4d3a89caaf3d74b4d324fab2e41943cdeb075 Author: juga0 <juga(a)riseup.net> Date: Sat Dec 1 15:59:09 2018 +0000 tests: add bandwidth and is_unmeasured to results --- tests/unit/conftest.py | 9 +++++++-- tests/unit/lib/data/results.txt | 2 +- tests/unit/lib/data/results_away.txt | 12 ++++++------ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py index 9b2201c..4dd442b 100644 --- a/tests/unit/conftest.py +++ b/tests/unit/conftest.py @@ -65,10 +65,13 @@ SCANNER = "test" AVG_BW = 966080 BUR_BW = 1048576 OBS_BW = 524288 +BW = 600000 +UNMEASURED = False RELAY1 = Result.Relay(FP1, NICK1, IP1, ED25519, average_bandwidth=AVG_BW, burst_bandwidth=BUR_BW, - observed_bandwidth=OBS_BW) + observed_bandwidth=OBS_BW, consensus_bandwidth=BW, + consensus_bandwidth_is_unmeasured=UNMEASURED) RELAY2 = Result.Relay(FP2, NICK2, IP2, ED25519) RESULT = Result(RELAY1, CIRC12, DEST_URL, SCANNER, t=TIME1) @@ -89,7 +92,9 @@ RELAY_DICT = { "master_key_ed25519": ED25519, "relay_average_bandwidth": AVG_BW, "relay_burst_bandwidth": BUR_BW, - "relay_observed_bandwidth": OBS_BW + "relay_observed_bandwidth": OBS_BW, + "consensus_bandwidth": BW, + "consensus_bandwidth_is_unmeasured": UNMEASURED, } BASE_RESULT_NO_RELAY_DICT = { diff --git a/tests/unit/lib/data/results.txt b/tests/unit/lib/data/results.txt index 9bb4909..59a35b4 100644 --- a/tests/unit/lib/data/results.txt +++ b/tests/unit/lib/data/results.txt @@ -1,2 +1,2 @@ -{"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_burst_bandwidth": 123456, "relay_observed_bandwidth": 524288} +{"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_burst_bandwidth": 123456, "relay_observed_bandwidth": 524288, "consensus_ba ndwidth": 600000, "consensus_bandwidth_is_unmeasured": false} {"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"} diff --git a/tests/unit/lib/data/results_away.txt b/tests/unit/lib/data/results_away.txt index 71698e8..6074bd9 100644 --- a/tests/unit/lib/data/results_away.txt +++ b/tests/unit/lib/data/results_away.txt @@ -1,7 +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_burst_bandwidth": 1000000000, "relay_observed_bandwidth": 524288} +{"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_burst_bandwidth": 1000000000, "relay_observed_bandwidth": 524288, "consensu s_bandwidth": 600000, "consensus_bandwidth_is_unmeasured": false} {"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_burst_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_burst_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_burst_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_burst_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_burst_bandwidth": 1000000000, "relay_observed_bandwidth": 524288} +{"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_burst_bandwidth": 1000000000, "relay_observed_bandwidth": 524288, "consensu s_bandwidth": 600000, "consensus_bandwidth_is_unmeasured": false} +{"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_burst_bandwidth": 1000000000, "relay_observed_bandwidth": 524288, "consensu s_bandwidth": 600000, "consensus_bandwidth_is_unmeasured": false} +{"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_burst_bandwidth": 1000000000, "relay_observed_bandwidth": 524288, "consensu s_bandwidth": 600000, "consensus_bandwidth_is_unmeasured": false} +{"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_burst_bandwidth": 1000000000, "relay_observed_bandwidth": 524288, "consensu s_bandwidth": 600000, "consensus_bandwidth_is_unmeasured": false} +{"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_burst_bandwidth": 1000000000, "relay_observed_bandwidth": 524288, "consensu s_bandwidth": 600000, "consensus_bandwidth_is_unmeasured": false}

1 0

[sbws/master] v3bwfile, resultdump: support results without new bw
by juga＠torproject.org 03 Dec '18

03 Dec '18

commit 54afe75307dfbe6256f4307c080b82e354737317 Author: juga0 <juga(a)riseup.net> Date: Mon Dec 3 20:58:23 2018 +0000 v3bwfile, resultdump: support results without new bw When parsing results support old ones without new bandwidth attributes, as descriptor bandwidth burst, consensus_bandwidth and consensus bandwidth is unmeasured. --- sbws/core/generate.py | 2 +- sbws/lib/resultdump.py | 6 +++--- sbws/lib/v3bwfile.py | 11 +++++++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/sbws/core/generate.py b/sbws/core/generate.py index f9b46cb..283a71f 100644 --- a/sbws/core/generate.py +++ b/sbws/core/generate.py @@ -54,7 +54,7 @@ def gen_parser(sub): p.add_argument('-m', '--torflow-bw-margin', default=TORFLOW_BW_MARGIN, type=float, help="Cap maximum bw when scaling as Torflow. ") - p.add_argument('-r', '--round-digs', '--torflow-round-digs', + p.add_argument('-r', '--torflow-round-digs', default=PROP276_ROUND_DIG, type=int, help="Number of most significant digits to round bw.") p.add_argument('-p', '--secs-recent', default=None, type=int, diff --git a/sbws/lib/resultdump.py b/sbws/lib/resultdump.py index 0f7e1af..3756f6f 100644 --- a/sbws/lib/resultdump.py +++ b/sbws/lib/resultdump.py @@ -501,9 +501,9 @@ class ResultSuccess(Result): Result.Relay( d['fingerprint'], d['nickname'], d['address'], d['master_key_ed25519'], d['relay_average_bandwidth'], - d['relay_burst_bandwidth'], d['relay_observed_bandwidth'], - d['consensus_bandwidth'], - d['consensus_bandwidth_is_unmeasured']), + d.get('relay_burst_bandwidth'), d['relay_observed_bandwidth'], + d.get('consensus_bandwidth'), + d.get('consensus_bandwidth_is_unmeasured')), d['circ'], d['dest_url'], d['scanner'], t=d['time']) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 55f63ec..4590812 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -848,8 +848,15 @@ class V3BWFile(object): # descriptors' bandwidth-observed, because that penalises new # relays. # See https://trac.torproject.org/projects/tor/ticket/8494 - desc_bw = min(desc_bw_obs, l.desc_bw_bur, l.desc_bw_avg) - if l.consensus_bandwidth_is_unmeasured: + if l.desc_bw_bur is not None: + # Because in previous versions results were not storing + # desc_bw_bur + desc_bw = min(desc_bw_obs, l.desc_bw_bur, l.desc_bw_avg) + else: + desc_bw = min(desc_bw_obs, l.desc_bw_avg) + # In previous versions results were not storing consensus_bandwidth + if l.consensus_bandwidth_is_unmeasured \ + or l.consensus_bandwidth is None: min_bandwidth = desc_bw # If the relay is measured, use the minimum between the descriptors # bandwidth and the consensus bandwidth, so that

1 0

[translation/torbutton-torbuttondtd_completed] Update translations for torbutton-torbuttondtd_completed
by translation＠torproject.org 03 Dec '18

03 Dec '18

commit 913ee7d7219e55ae9d4d4f42bb2b83fb57e7f3ac Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 3 21:18:12 2018 +0000 Update translations for torbutton-torbuttondtd_completed --- pt_BR/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/torbutton.dtd b/pt_BR/torbutton.dtd index 70e90ca09..594b4a628 100644 --- a/pt_BR/torbutton.dtd +++ b/pt_BR/torbutton.dtd @@ -38,9 +38,9 @@ <!ENTITY torbutton.prefs.sec_safer_label "Seguro"> <!ENTITY torbutton.prefs.sec_safer_description "Desativar recursos geralmente inseguros de websites, o que pode fazer com que alguns sites percam a funcionalidade."> <!ENTITY torbutton.prefs.sec_safer_list_label "No nível seguro:"> -<!ENTITY torbutton.prefs.sec_safest_label "Mais seguro"> +<!ENTITY torbutton.prefs.sec_safest_label "Segurança máxima"> <!ENTITY torbutton.prefs.sec_safest_description "Apenas permitir os recursos dos websites necessários para sites estáticos e serviços básicos. Essas mudanças afetam imagens, mídias e scripts."> -<!ENTITY torbutton.prefs.sec_safest_list_label "No nível mais seguro:"> +<!ENTITY torbutton.prefs.sec_safest_list_label "No nível de segurança máxima:"> <!ENTITY torbutton.prefs.sec_learn_more_label "Aprenda mais"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript está desativado em todos os sites sem HTTPS."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript está desativado por padrão em todos os sites.">

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 03 Dec '18

03 Dec '18

commit 7938192de59027298d50df41158008086fddfc28 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 3 21:18:06 2018 +0000 Update translations for torbutton-torbuttondtd --- pt_BR/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/torbutton.dtd b/pt_BR/torbutton.dtd index 70e90ca09..594b4a628 100644 --- a/pt_BR/torbutton.dtd +++ b/pt_BR/torbutton.dtd @@ -38,9 +38,9 @@ <!ENTITY torbutton.prefs.sec_safer_label "Seguro"> <!ENTITY torbutton.prefs.sec_safer_description "Desativar recursos geralmente inseguros de websites, o que pode fazer com que alguns sites percam a funcionalidade."> <!ENTITY torbutton.prefs.sec_safer_list_label "No nível seguro:"> -<!ENTITY torbutton.prefs.sec_safest_label "Mais seguro"> +<!ENTITY torbutton.prefs.sec_safest_label "Segurança máxima"> <!ENTITY torbutton.prefs.sec_safest_description "Apenas permitir os recursos dos websites necessários para sites estáticos e serviços básicos. Essas mudanças afetam imagens, mídias e scripts."> -<!ENTITY torbutton.prefs.sec_safest_list_label "No nível mais seguro:"> +<!ENTITY torbutton.prefs.sec_safest_list_label "No nível de segurança máxima:"> <!ENTITY torbutton.prefs.sec_learn_more_label "Aprenda mais"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript está desativado em todos os sites sem HTTPS."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript está desativado por padrão em todos os sites.">

1 0

[translation/torbutton-torbuttondtd_completed] Update translations for torbutton-torbuttondtd_completed
by translation＠torproject.org 03 Dec '18

03 Dec '18

commit fba8ecd6861600a37a462acc488ed7eef1b20d41 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 3 20:48:13 2018 +0000 Update translations for torbutton-torbuttondtd_completed --- pt_BR/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/torbutton.dtd b/pt_BR/torbutton.dtd index 415f15177..70e90ca09 100644 --- a/pt_BR/torbutton.dtd +++ b/pt_BR/torbutton.dtd @@ -35,9 +35,9 @@ <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider possibilita que você desabilite certas funcionalidades de navegação que podem torná-la mais vulnerável a tentativas de ataque."> <!ENTITY torbutton.prefs.sec_standard_label "Padrão"> <!ENTITY torbutton.prefs.sec_standard_description "Todos os recursos do Navegador Tor e do website estão ativos."> -<!ENTITY torbutton.prefs.sec_safer_label "Mais seguro"> +<!ENTITY torbutton.prefs.sec_safer_label "Seguro"> <!ENTITY torbutton.prefs.sec_safer_description "Desativar recursos geralmente inseguros de websites, o que pode fazer com que alguns sites percam a funcionalidade."> -<!ENTITY torbutton.prefs.sec_safer_list_label "No nível mais seguro:"> +<!ENTITY torbutton.prefs.sec_safer_list_label "No nível seguro:"> <!ENTITY torbutton.prefs.sec_safest_label "Mais seguro"> <!ENTITY torbutton.prefs.sec_safest_description "Apenas permitir os recursos dos websites necessários para sites estáticos e serviços básicos. Essas mudanças afetam imagens, mídias e scripts."> <!ENTITY torbutton.prefs.sec_safest_list_label "No nível mais seguro:">

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 03 Dec '18

03 Dec '18

commit 9be8a504b2471a96ed000e62e9b2cff7b3b4bf23 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 3 20:48:08 2018 +0000 Update translations for torbutton-torbuttondtd --- pt_BR/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/torbutton.dtd b/pt_BR/torbutton.dtd index 415f15177..70e90ca09 100644 --- a/pt_BR/torbutton.dtd +++ b/pt_BR/torbutton.dtd @@ -35,9 +35,9 @@ <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider possibilita que você desabilite certas funcionalidades de navegação que podem torná-la mais vulnerável a tentativas de ataque."> <!ENTITY torbutton.prefs.sec_standard_label "Padrão"> <!ENTITY torbutton.prefs.sec_standard_description "Todos os recursos do Navegador Tor e do website estão ativos."> -<!ENTITY torbutton.prefs.sec_safer_label "Mais seguro"> +<!ENTITY torbutton.prefs.sec_safer_label "Seguro"> <!ENTITY torbutton.prefs.sec_safer_description "Desativar recursos geralmente inseguros de websites, o que pode fazer com que alguns sites percam a funcionalidade."> -<!ENTITY torbutton.prefs.sec_safer_list_label "No nível mais seguro:"> +<!ENTITY torbutton.prefs.sec_safer_list_label "No nível seguro:"> <!ENTITY torbutton.prefs.sec_safest_label "Mais seguro"> <!ENTITY torbutton.prefs.sec_safest_description "Apenas permitir os recursos dos websites necessários para sites estáticos e serviços básicos. Essas mudanças afetam imagens, mídias e scripts."> <!ENTITY torbutton.prefs.sec_safest_list_label "No nível mais seguro:">

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 03 Dec '18

03 Dec '18

commit befff35b3fab95c3019efd334f2df68f44dcb676 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 3 20:47:33 2018 +0000 Update translations for tor-browser-manual --- pt_BR/pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 72eb276a2..f95ef7379 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -3,7 +3,7 @@ # wasabicake, 2016 # Communia <ameaneantie(a)riseup.net>, 2016 # Helder, 2018 -# Jose Victor <josevictor(a)riseup.net>, 2018 +# jose, 2018 # Reurison Silva Rodrigues, 2018 # Malkon F <malkon.inf(a)gmail.com>, 2018 # Alexei Gonçalves de Oliveira <alexis(a)gessicahellmann.com>, 2018

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 03 Dec '18

03 Dec '18

commit eafa205ecf59d9fbe4fca09864c77171fb7af3cb Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 3 20:46:59 2018 +0000 Update translations for tbmanual-contentspot --- contents+pt-BR.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index ce465bd00..d3b65daef 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -953,6 +953,8 @@ msgid "" "You can see a diagram of the circuit that Tor Browser is using for the " "current tab in the site information menu, in the URL bar." msgstr "" +"Você pode ver um diagrama do circuito que o Navegador Tor está usando para a" +" guia atual no menu de informações do site, na barra de URL." #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body)

1 0

[webwml/master] Fix Tor Browser Android download links
by boklm＠torproject.org 03 Dec '18

03 Dec '18

commit 08c4159bdfa1110270e92b71ffd9634a413e0bc5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 3 21:42:07 2018 +0100 Fix Tor Browser Android download links --- download/en/download-easy.wml | 4 ++-- download/en/download.wml | 4 ++-- projects/en/torbrowser.wml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml index feb2d74c..9e2d6a34 100644 --- a/download/en/download-easy.wml +++ b/download/en/download-easy.wml @@ -189,9 +189,9 @@ the app. We plan on fixing it for the next release. </p> <form class="downloads"> - <a class="button" href="../dist/torbrowser/<version-torbrowserbundleandroidbeta>/tor-browser-android-<version-torbrowserbundleandroidbeta>-armv7.apk"><span class="strong">Download</span><span class="normal">Android</span></a> + <a class="button" href="../dist/torbrowser/<version-torbrowserbundleandroidbeta>/tor-browser-<version-torbrowserbundleandroidbeta>-android-armv7.apk"><span class="strong">Download</span><span class="normal">Android</span></a> <div class="sig"> - (<a class="android-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundleandroidbeta>/tor-browser-android-<version-torbrowserbundleandroidbeta>-armv7.apk.asc">sig</a>) + (<a class="android-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundleandroidbeta>/tor-browser-<version-torbrowserbundleandroidbeta>-android-armv7.apk.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> diff --git a/download/en/download.wml b/download/en/download.wml index c68e7141..6111632c 100644 --- a/download/en/download.wml +++ b/download/en/download.wml @@ -165,9 +165,9 @@ custom configurations. All an apt-get or yum install away.</p> <div class="fauxhead"></div> <div class="package" style="padding-top: 13px; border-top: 0px;"> <form class="downloads"> - <a class="button" href="../dist/torbrowser/<version-torbrowserbundleandroidbeta>/tor-browser-android-<version-torbrowserbundleandroidbeta>-armv7.apk"><span class="strong">Download</span><span class="normal">Android</span></a> + <a class="button" href="../dist/torbrowser/<version-torbrowserbundleandroidbeta>/tor-browser-<version-torbrowserbundleandroidbeta>-android-armv7.apk"><span class="strong">Download</span><span class="normal">Android</span></a> <div class="sig"> - (<a class="android-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundleandroidbeta>/tor-browser-android-<version-torbrowserbundleandroidbeta>-armv7.apk.asc">sig</a>) + (<a class="android-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundleandroidbeta>/tor-browser-<version-torbrowserbundleandroidbeta>-android-armv7.apk.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml index 7f3c8ec0..c1011be6 100644 --- a/projects/en/torbrowser.wml +++ b/projects/en/torbrowser.wml @@ -531,8 +531,8 @@ <em>(<a href="../dist/torbrowser/<version-torbrowserbundlelinux32beta>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_en-US.tar.xz.asc">sig</a>)</em> • <a href="../dist/torbrowser/<version-torbrowserbundlelinux64beta>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_en-US.tar.xz">64-bit</a> <em>(<a href="../dist/torbrowser/<version-torbrowserbundlelinux64beta>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_en-US.tar.xz.asc">sig</a>)</em></td> - <td><a href="../dist/torbrowser/<version-torbrowserbundleandroidbeta>/tor-browser-android-<version-torbrowserbundleandroidbeta>-armv7.apk">Android</a> - <em>(<a href="../dist/torbrowser/<version-torbrowserbundleandroidbeta>/tor-browser-android-<version-torbrowserbundleandroidbeta>-armv7.apk.asc">sig</a>)</em></td> + <td><a href="../dist/torbrowser/<version-torbrowserbundleandroidbeta>/tor-browser-<version-torbrowserbundleandroidbeta>-android-armv7.apk">Android</a> + <em>(<a href="../dist/torbrowser/<version-torbrowserbundleandroidbeta>/tor-browser-<version-torbrowserbundleandroidbeta>-android-armv7.apk.asc">sig</a>)</em></td> </tr> <tr class="alt"> <td>العربية (ar)</td>

1 0

[webwml/master] Tor Browser for Android now includes Orbot
by boklm＠torproject.org 03 Dec '18

03 Dec '18

commit 0107c84cd7a9505295fc257664f9eda85123d721 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 3 21:35:50 2018 +0100 Tor Browser for Android now includes Orbot Remove instructions to install Orbot when using Tor Browser for Android. --- download/en/download-easy.wml | 5 ----- download/en/download.wml | 4 ---- 2 files changed, 9 deletions(-) diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml index 76a75a9d..feb2d74c 100644 --- a/download/en/download-easy.wml +++ b/download/en/download-easy.wml @@ -184,11 +184,6 @@ button below. </p> <p> - Note: For this release, you also need to install Orbot, you can - learn more about it - <a href="https://www.torproject.org/docs/android.html.en">here</a>. - </p> - <p> Known issue: Our Security Slider is now under ‘Security Settings, but because of a small issue, it’s only showing up after you restart the app. We plan on fixing it for the next release. diff --git a/download/en/download.wml b/download/en/download.wml index 16da8209..c68e7141 100644 --- a/download/en/download.wml +++ b/download/en/download.wml @@ -181,10 +181,6 @@ custom configurations. All an apt-get or yum install away.</p> or you can get the apk by clicking on the button below. </p> <p> - Note: For this release, <b>you also need to install Orbot</b>, you can - learn more about it <a href="https://guardianproject.info/apps/orbot">here</a>. - </p> - <p> Known issue: Our Security Slider is now under ‘Security Settings, but because of a small issue, it’s only showing up after you restart the app. We plan on fixing it for the next release.

1 0