diff options
| author | David Goulet <dgoulet@torproject.org> | 2022-10-26 15:01:43 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2022-10-26 15:01:43 -0400 |
| commit | ca135a127d3641dde301eb7dfa4f50edce878a0e (patch) | |
| tree | 133c4fc250780a323fc2b3f98a9db2894864a4cb /src/feature/dirauth | |
| parent | 17207449045589f24eb3f6bedc598898832adecc (diff) | |
| parent | 0a49e04691b6f6efedadc003521cd0e5809f81da (diff) | |
| download | tor-ca135a127d3641dde301eb7dfa4f50edce878a0e.tar.gz tor-ca135a127d3641dde301eb7dfa4f50edce878a0e.zip | |
Merge branch 'maint-0.4.7'
Diffstat (limited to 'src/feature/dirauth')
| -rw-r--r-- | src/feature/dirauth/dirauth_options.inc | 3 | ||||
| -rw-r--r-- | src/feature/dirauth/dirvote.c | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/feature/dirauth/dirauth_options.inc b/src/feature/dirauth/dirauth_options.inc index 7ee0201e1a..a43ed285ce 100644 --- a/src/feature/dirauth/dirauth_options.inc +++ b/src/feature/dirauth/dirauth_options.inc @@ -138,7 +138,4 @@ CONF_VAR(VersioningAuthoritativeDirectory, BOOL, 0, "0") * pressure or not. */ CONF_VAR(AuthDirRejectRequestsUnderLoad, BOOL, 0, "1") -/** Boolean: Should we not give bandwidth weight measurements to dirauths? */ -CONF_VAR(AuthDirDontVoteOnDirAuthBandwidth, BOOL, 0, "1") - END_CONF_STRUCT(dirauth_options_t) diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index b4a9f83f19..b9f022bebd 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -2317,8 +2317,7 @@ networkstatus_compute_consensus(smartlist_t *votes, smartlist_add_asprintf(chunks, "pr %s\n", chosen_protocol_list); } /* Now the weight line. */ - if (rs_out.has_bandwidth && (!rs_out.is_authority || - !dirauth_get_options()->AuthDirDontVoteOnDirAuthBandwidth)) { + if (rs_out.has_bandwidth) { char *guardfraction_str = NULL; int unmeasured = rs_out.bw_is_unmeasured; |