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

[tor/master] fixup! Make ROUTERLIST_PRUNING_INTERVAL 1 hr.
by nickm＠torproject.org 26 Nov '18

26 Nov '18

commit c8c4c3dffa71b4bbc9e7cabfee2124fb5e19ad39 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat Nov 17 10:27:10 2018 +0200 fixup! Make ROUTERLIST_PRUNING_INTERVAL 1 hr. --- changes/bug27929 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug27929 b/changes/bug27929 index a97d18f20..dab57a2ec 100644 --- a/changes/bug27929 +++ b/changes/bug27929 @@ -1,5 +1,5 @@ o Minor bugfixes (periodic events): - Refrain from calling routerlist_remove_old_routers() from check_descriptor_callback(). Instead, create a new periodic - event that will run every minute even if Tor is not configured + event that will run once every hour even if Tor is not configured as onion router. Fixes bug 27929; bugfix on 0.2.8.1-alpha.

1 0

[tor/master] Create new periodic event for pruning old info about Tor routers
by nickm＠torproject.org 26 Nov '18

26 Nov '18

commit 100136ca8624151605601d80b63746cfaeb6df47 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Nov 11 20:24:07 2018 +0200 Create new periodic event for pruning old info about Tor routers --- changes/bug27929 | 5 +++++ src/core/mainloop/mainloop.c | 32 ++++++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/changes/bug27929 b/changes/bug27929 new file mode 100644 index 000000000..a97d18f20 --- /dev/null +++ b/changes/bug27929 @@ -0,0 +1,5 @@ + o Minor bugfixes (periodic events): + - Refrain from calling routerlist_remove_old_routers() from + check_descriptor_callback(). Instead, create a new periodic + event that will run every minute even if Tor is not configured + as onion router. Fixes bug 27929; bugfix on 0.2.8.1-alpha. diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index a9f142978..be1913613 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -1359,6 +1359,7 @@ CALLBACK(heartbeat); CALLBACK(hs_service); CALLBACK(launch_descriptor_fetches); CALLBACK(launch_reachability_tests); +CALLBACK(prune_old_routers); CALLBACK(reachability_warnings); CALLBACK(record_bridge_stats); CALLBACK(rend_cache_failure_clean); @@ -1391,6 +1392,8 @@ STATIC periodic_event_item_t periodic_events[] = { CALLBACK(retry_listeners, PERIODIC_EVENT_ROLE_ALL, PERIODIC_EVENT_FLAG_NEED_NET), CALLBACK(save_state, PERIODIC_EVENT_ROLE_ALL, 0), + CALLBACK(prune_old_routers, PERIODIC_EVENT_ROLE_ALL, + PERIODIC_EVENT_FLAG_NEED_NET), CALLBACK(rotate_x509_certificate, PERIODIC_EVENT_ROLE_ALL, 0), CALLBACK(write_stats_file, PERIODIC_EVENT_ROLE_ALL, 0), @@ -1454,6 +1457,7 @@ static periodic_event_item_t *fetch_networkstatus_event=NULL; static periodic_event_item_t *launch_descriptor_fetches_event=NULL; static periodic_event_item_t *check_dns_honesty_event=NULL; static periodic_event_item_t *save_state_event=NULL; +static periodic_event_item_t *prune_old_routers_event=NULL; /** Reset all the periodic events so we'll do all our actions again as if we * just started up. @@ -1556,6 +1560,7 @@ initialize_periodic_events(void) STMT_BEGIN name ## _event = find_periodic_event( #name ); STMT_END NAMED_CALLBACK(check_descriptor); + NAMED_CALLBACK(prune_old_routers); NAMED_CALLBACK(dirvote); NAMED_CALLBACK(fetch_networkstatus); NAMED_CALLBACK(launch_descriptor_fetches); @@ -2220,6 +2225,27 @@ retry_dns_callback(time_t now, const or_options_t *options) return RETRY_DNS_INTERVAL; } +/** + * Periodic callback: prune routerlist of old information about Tor network. + */ +static int +prune_old_routers_callback(time_t now, const or_options_t *options) +{ +#define ROUTERLIST_PRUNING_INTERVAL (60) // 1 minute. + (void)now; + (void)options; + + if (!net_is_disabled()) { + /* If any networkstatus documents are no longer recent, we need to + * update all the descriptors' running status. */ + /* Remove dead routers. */ + log_debug(LD_GENERAL, "Pruning routerlist..."); + routerlist_remove_old_routers(); + } + + return ROUTERLIST_PRUNING_INTERVAL; +} + /** Periodic callback: consider rebuilding or and re-uploading our descriptor * (if we've passed our internal checks). */ static int @@ -2239,12 +2265,6 @@ check_descriptor_callback(time_t now, const or_options_t *options) check_descriptor_ipaddress_changed(now); mark_my_descriptor_dirty_if_too_old(now); consider_publishable_server(0); - /* If any networkstatus documents are no longer recent, we need to - * update all the descriptors' running status. */ - /* Remove dead routers. */ - /* XXXX This doesn't belong here, but it was here in the pre- - * XXXX refactoring code. */ - routerlist_remove_old_routers(); } return CHECK_DESCRIPTOR_INTERVAL;

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/495'
by nickm＠torproject.org 26 Nov '18

26 Nov '18

commit fc1ad9ab652063bdabb56a71ea6c005b66ed9f4c Merge: e12fdeb18 c8c4c3dff Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 26 17:17:40 2018 -0500 Merge remote-tracking branch 'tor-github/pr/495' changes/bug27929 | 5 +++++ src/core/mainloop/mainloop.c | 32 ++++++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 6 deletions(-) diff --cc src/core/mainloop/mainloop.c index 42df1038a,0b9d4e088..2e2ae876d --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@@ -1371,80 -1376,72 +1372,82 @@@ CALLBACK(second_elapsed) #undef CALLBACK /* Now we declare an array of periodic_event_item_t for each periodic event */ -#define CALLBACK(name, r, f) PERIODIC_EVENT(name, r, f) +#define CALLBACK(name, r, f) \ + PERIODIC_EVENT(name, PERIODIC_EVENT_ROLE_ ## r, f) +#define FL(name) (PERIODIC_EVENT_FLAG_ ## name) STATIC periodic_event_item_t periodic_events[] = { - /* Everyone needs to run those. */ - CALLBACK(add_entropy, PERIODIC_EVENT_ROLE_ALL, 0), - CALLBACK(check_expired_networkstatus, PERIODIC_EVENT_ROLE_ALL, 0), - CALLBACK(clean_caches, PERIODIC_EVENT_ROLE_ALL, 0), - CALLBACK(fetch_networkstatus, PERIODIC_EVENT_ROLE_ALL, - PERIODIC_EVENT_FLAG_NEED_NET), - CALLBACK(heartbeat, PERIODIC_EVENT_ROLE_ALL, 0), - CALLBACK(launch_descriptor_fetches, PERIODIC_EVENT_ROLE_ALL, - PERIODIC_EVENT_FLAG_NEED_NET), - CALLBACK(reset_padding_counts, PERIODIC_EVENT_ROLE_ALL, 0), - CALLBACK(retry_listeners, PERIODIC_EVENT_ROLE_ALL, - PERIODIC_EVENT_FLAG_NEED_NET), - CALLBACK(save_state, PERIODIC_EVENT_ROLE_ALL, 0), - CALLBACK(prune_old_routers, PERIODIC_EVENT_ROLE_ALL, - PERIODIC_EVENT_FLAG_NEED_NET), - CALLBACK(rotate_x509_certificate, PERIODIC_EVENT_ROLE_ALL, 0), - CALLBACK(write_stats_file, PERIODIC_EVENT_ROLE_ALL, 0), ++ + /* Everyone needs to run these. They need to have very long timeouts for + * that to be safe. */ + CALLBACK(add_entropy, ALL, 0), + CALLBACK(heartbeat, ALL, 0), + CALLBACK(reset_padding_counts, ALL, 0), + + /* This is a legacy catch-all callback that runs once per second if + * we are online and active. */ + CALLBACK(second_elapsed, NET_PARTICIPANT, + FL(NEED_NET)|FL(RUN_ON_DISABLE)), + + /* XXXX Do we have a reason to do this on a callback? Does it do any good at + * all? For now, if we're dormant, we can let our listeners decay. */ + CALLBACK(retry_listeners, NET_PARTICIPANT, FL(NEED_NET)), + + /* We need to do these if we're participating in the Tor network. */ + CALLBACK(check_expired_networkstatus, NET_PARTICIPANT, 0), + CALLBACK(fetch_networkstatus, NET_PARTICIPANT, 0), + CALLBACK(launch_descriptor_fetches, NET_PARTICIPANT, FL(NEED_NET)), + CALLBACK(rotate_x509_certificate, NET_PARTICIPANT, 0), + CALLBACK(check_network_participation, NET_PARTICIPANT, 0), + + /* We need to do these if we're participating in the Tor network, and + * immediately before we stop. */ + CALLBACK(clean_caches, NET_PARTICIPANT, FL(RUN_ON_DISABLE)), + CALLBACK(save_state, NET_PARTICIPANT, FL(RUN_ON_DISABLE)), + CALLBACK(write_stats_file, NET_PARTICIPANT, FL(RUN_ON_DISABLE)), ++ CALLBACK(prune_old_routers, NET_PARTICIPANT, FL(RUN_ON_DISABLE)), /* Routers (bridge and relay) only. */ - CALLBACK(check_descriptor, PERIODIC_EVENT_ROLE_ROUTER, - PERIODIC_EVENT_FLAG_NEED_NET), - CALLBACK(check_ed_keys, PERIODIC_EVENT_ROLE_ROUTER, 0), - CALLBACK(check_for_reachability_bw, PERIODIC_EVENT_ROLE_ROUTER, - PERIODIC_EVENT_FLAG_NEED_NET), - CALLBACK(check_onion_keys_expiry_time, PERIODIC_EVENT_ROLE_ROUTER, 0), - CALLBACK(expire_old_ciruits_serverside, PERIODIC_EVENT_ROLE_ROUTER, - PERIODIC_EVENT_FLAG_NEED_NET), - CALLBACK(reachability_warnings, PERIODIC_EVENT_ROLE_ROUTER, - PERIODIC_EVENT_FLAG_NEED_NET), - CALLBACK(retry_dns, PERIODIC_EVENT_ROLE_ROUTER, 0), - CALLBACK(rotate_onion_key, PERIODIC_EVENT_ROLE_ROUTER, 0), + CALLBACK(check_descriptor, ROUTER, FL(NEED_NET)), + CALLBACK(check_ed_keys, ROUTER, 0), + CALLBACK(check_for_reachability_bw, ROUTER, FL(NEED_NET)), + CALLBACK(check_onion_keys_expiry_time, ROUTER, 0), + CALLBACK(expire_old_ciruits_serverside, ROUTER, FL(NEED_NET)), + CALLBACK(reachability_warnings, ROUTER, FL(NEED_NET)), + CALLBACK(retry_dns, ROUTER, 0), + CALLBACK(rotate_onion_key, ROUTER, 0), /* Authorities (bridge and directory) only. */ - CALLBACK(downrate_stability, PERIODIC_EVENT_ROLE_AUTHORITIES, 0), - CALLBACK(launch_reachability_tests, PERIODIC_EVENT_ROLE_AUTHORITIES, - PERIODIC_EVENT_FLAG_NEED_NET), - CALLBACK(save_stability, PERIODIC_EVENT_ROLE_AUTHORITIES, 0), + CALLBACK(downrate_stability, AUTHORITIES, 0), + CALLBACK(launch_reachability_tests, AUTHORITIES, FL(NEED_NET)), + CALLBACK(save_stability, AUTHORITIES, 0), /* Directory authority only. */ - CALLBACK(check_authority_cert, PERIODIC_EVENT_ROLE_DIRAUTH, 0), - CALLBACK(dirvote, PERIODIC_EVENT_ROLE_DIRAUTH, PERIODIC_EVENT_FLAG_NEED_NET), + CALLBACK(check_authority_cert, DIRAUTH, 0), + CALLBACK(dirvote, DIRAUTH, FL(NEED_NET)), /* Relay only. */ - CALLBACK(check_canonical_channels, PERIODIC_EVENT_ROLE_RELAY, - PERIODIC_EVENT_FLAG_NEED_NET), - CALLBACK(check_dns_honesty, PERIODIC_EVENT_ROLE_RELAY, - PERIODIC_EVENT_FLAG_NEED_NET), + CALLBACK(check_canonical_channels, RELAY, FL(NEED_NET)), + CALLBACK(check_dns_honesty, RELAY, FL(NEED_NET)), /* Hidden Service service only. */ - CALLBACK(hs_service, PERIODIC_EVENT_ROLE_HS_SERVICE, - PERIODIC_EVENT_FLAG_NEED_NET), + CALLBACK(hs_service, HS_SERVICE, FL(NEED_NET)), // XXXX break this down more /* Bridge only. */ - CALLBACK(record_bridge_stats, PERIODIC_EVENT_ROLE_BRIDGE, 0), + CALLBACK(record_bridge_stats, BRIDGE, 0), /* Client only. */ - CALLBACK(rend_cache_failure_clean, PERIODIC_EVENT_ROLE_CLIENT, 0), + /* XXXX this could be restricted to CLIENT+NET_PARTICIPANT */ + CALLBACK(rend_cache_failure_clean, NET_PARTICIPANT, FL(RUN_ON_DISABLE)), /* Bridge Authority only. */ - CALLBACK(write_bridge_ns, PERIODIC_EVENT_ROLE_BRIDGEAUTH, 0), + CALLBACK(write_bridge_ns, BRIDGEAUTH, 0), /* Directory server only. */ - CALLBACK(clean_consdiffmgr, PERIODIC_EVENT_ROLE_DIRSERVER, 0), + CALLBACK(clean_consdiffmgr, DIRSERVER, 0), + + /* Controller with per-second events only. */ + CALLBACK(control_per_second_events, CONTROLEV, 0), END_OF_PERIODIC_EVENTS };

1 0

[tor/master] Make ROUTERLIST_PRUNING_INTERVAL 1 hr.
by nickm＠torproject.org 26 Nov '18

26 Nov '18

commit 411780d563e4d08e12d8aef0bbe8915f48011cca Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat Nov 17 10:19:25 2018 +0200 Make ROUTERLIST_PRUNING_INTERVAL 1 hr. --- src/core/mainloop/mainloop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index be1913613..0b9d4e088 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -2231,7 +2231,7 @@ retry_dns_callback(time_t now, const or_options_t *options) static int prune_old_routers_callback(time_t now, const or_options_t *options) { -#define ROUTERLIST_PRUNING_INTERVAL (60) // 1 minute. +#define ROUTERLIST_PRUNING_INTERVAL (60*60) // 1 hour. (void)now; (void)options;

1 0

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

26 Nov '18

commit b84633947f6bbeb0c831b8a354a97deea7b67446 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 26 22:15:04 2018 +0000 Update translations for abouttor-homepage --- es_AR/aboutTor.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/es_AR/aboutTor.dtd b/es_AR/aboutTor.dtd index 4e129ea75..692f996f9 100644 --- a/es_AR/aboutTor.dtd +++ b/es_AR/aboutTor.dtd @@ -35,13 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Proteger la privacidad de millones."> <!ENTITY aboutTor.donationBanner.line2e "Mantener fuerte a Tor."> <!ENTITY aboutTor.donationBanner.line2f "¡Necesitamos tu apoyo!"> -<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> -<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> -<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> +<!ENTITY aboutTor.donationBanner.line2g "Apoyá la libertad en Internet."> +<!ENTITY aboutTor.donationBanner.line2h "Defendé la web abierta."> +<!ENTITY aboutTor.donationBanner.line2i "Apoyá la privacidad y libertad en línea."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla está emparejando cada donación hasta 2019."> <!ENTITY aboutTor.donationBanner.line3 "Dá hoy, y Mozilla emparejará tu donación."> -<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> +<!ENTITY aboutTor.donationBanner.line3b "Dá ahora, y tu regalo se hace el doble de fuerte."> <!ENTITY aboutTor.donationBanner.buttonA "Doná ahora"> <!ENTITY aboutTor.donationBanner.buttonB "Contá conmigo">

1 0

[torspec/master] Include variable used in pseudocode in step 1
by nickm＠torproject.org 26 Nov '18

26 Nov '18

commit 102f3727a65de1030eb26f4943437d42b8e37e37 Author: teor <teor(a)torproject.org> Date: Wed Nov 7 17:30:29 2018 +0000 Include variable used in pseudocode in step 1 Co-Authored-By: juga0 <juga(a)riseup.net> --- bandwidth-file-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt index d8c27de..b5b400c 100644 --- a/bandwidth-file-spec.txt +++ b/bandwidth-file-spec.txt @@ -535,7 +535,7 @@ ones that this bandwidth authority has measured for the relays that would be included in the next bandwidth authority's upcoming vote. 1. Calculate the filtered bandwidth for each relay: - - choose the relay's measurements that are equal or greater than the + - choose the relay's measurements (`bw_j`) that are equal or greater than the mean of the measurements for this relay - calculate the mean of those measurements

1 0

[torspec/master] Add torflow scaling section
by nickm＠torproject.org 26 Nov '18

26 Nov '18

commit 0f95e49d0b4d27b6b1a19141d72bcf4261372215 Author: juga0 <juga(a)riseup.net> Date: Thu Oct 25 15:41:29 2018 +0000 Add torflow scaling section It explains in a different way section 2.2 in torflow's README.spec.txt. --- bandwidth-file-spec.txt | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt index 9a3f63f..8e84bdd 100644 --- a/bandwidth-file-spec.txt +++ b/bandwidth-file-spec.txt @@ -522,3 +522,68 @@ reduced or increased as needed. Smaller quotas decrease the size of uncompressed consensuses, and may decrease the size of consensus diffs and compressed consensuses. But if the relay quota is too small, some relays may be over- or under-weighted. + +B.4. Torflow aggreation + +Torflow implements two methods to compute the bandwidth values from the +(stream) bandwidth measurements: with and without PID control feedback. +The method described here is the later (see Torflow specification, +section 2.2). + +In the following sections, the relays' measured bandwidth refer to the +ones that this bandwidth authority has measured for the relays that +would be included in the next bandwidth authority's upcoming vote. + +1. Calculate the filtered bandwidth for each relay: + - choose the relay's measurements that are equal or greater than the + mean of the measurements for this relay + - calculate the mean of those measurements + + In pseudocode: + + bw_filt_i = mean(max(mean(bw_j), bw_j)) + +2. Calculate network averages: + - calculate the filtered average by dividing the sum of all the + relays' filtered bandwidth by the number of relays that have been + measured, ie, calculate the mean average of the relays' filtered + bandwidth. + - calculate the stream average by dividing the sum of all the + relays' filtered bandwidth by the number of relays that have been + measured, ie, calculate the mean average or the relays' measured + bandwidth. + + In pseudocode: + + bw_avg_filt_ = bw_filt_i / n_filt + bw_avg_strm = bw_i / n + +3. Calculate ratios for each relay: + - calculate the filtered ratio by dividing each relay filtered bandwidth + by the filtered average + - calculate the stream ratio by dividing each relay measured bandwidth + by the stream average + + In pseudocode: + + r_filt_i = bw_filt_i / bw_avg_filt + r_strm_i = bw_avg_strm / bw_avg_strm + +4. Calculate the final ratio for each relay: + The final ratio is the larger between the filtered bandwidth and the + stream bandwidth. + + In pseudocode: + + r_i = max(r_filt_i, r_strm_i) + +5. Calculate the scaled bandwidth for each relay: + The most recent descriptor observed bandwidth is multiplied by the ratio + + In pseudocode: + + bw_new_i = r_i * bw_obs_i + + <<In this way, the resulting network status consensus bandwidth values + are effectively re-weighted proportional to how much faster the node + was as compared to the rest of the network.>>

1 0

[torspec/master] Rephrase which torflow method is explained
by nickm＠torproject.org 26 Nov '18

26 Nov '18

commit c06bcce1fe6cfd0b43bf051a4bbe6c492b1620d5 Author: teor <teor(a)torproject.org> Date: Wed Nov 7 17:26:54 2018 +0000 Rephrase which torflow method is explained Co-Authored-By: juga0 <juga(a)riseup.net> --- bandwidth-file-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt index 8e84bdd..d8c27de 100644 --- a/bandwidth-file-spec.txt +++ b/bandwidth-file-spec.txt @@ -527,7 +527,7 @@ B.4. Torflow aggreation Torflow implements two methods to compute the bandwidth values from the (stream) bandwidth measurements: with and without PID control feedback. -The method described here is the later (see Torflow specification, +The method described here is without PID control (see Torflow specification, section 2.2). In the following sections, the relays' measured bandwidth refer to the

1 0

[torspec/master] Include variable n in step 2
by nickm＠torproject.org 26 Nov '18

26 Nov '18

commit 9f5b4a1debb6bf56c2ccc8539aa04b3585e27277 Author: teor <teor(a)torproject.org> Date: Wed Nov 7 17:33:33 2018 +0000 Include variable n in step 2 Co-Authored-By: juga0 <juga(a)riseup.net> --- bandwidth-file-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt index 784e92a..7073539 100644 --- a/bandwidth-file-spec.txt +++ b/bandwidth-file-spec.txt @@ -550,7 +550,7 @@ would be included in the next bandwidth authority's upcoming vote. bandwidth. - calculate the stream average by dividing the sum of all the relays' filtered bandwidth by the number of relays that have been - measured, ie, calculate the mean average or the relays' measured + measured (`n`), ie, calculate the mean average or the relays' measured bandwidth. In pseudocode:

1 0

[torspec/master] Include n_filt in description in step 2
by nickm＠torproject.org 26 Nov '18

26 Nov '18

commit 111039d66a9fb8b560d3145c29f317a81cae8507 Author: teor <teor(a)torproject.org> Date: Wed Nov 7 17:32:48 2018 +0000 Include n_filt in description in step 2 Co-Authored-By: juga0 <juga(a)riseup.net> --- bandwidth-file-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt index b5b400c..784e92a 100644 --- a/bandwidth-file-spec.txt +++ b/bandwidth-file-spec.txt @@ -546,7 +546,7 @@ would be included in the next bandwidth authority's upcoming vote. 2. Calculate network averages: - calculate the filtered average by dividing the sum of all the relays' filtered bandwidth by the number of relays that have been - measured, ie, calculate the mean average of the relays' filtered + measured (`n_filt`), ie, calculate the mean average of the relays' filtered bandwidth. - calculate the stream average by dividing the sum of all the relays' filtered bandwidth by the number of relays that have been

1 0