diff options
| author | David Goulet <dgoulet@torproject.org> | 2022-10-26 15:01:40 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2022-10-26 15:01:40 -0400 |
| commit | 0a49e04691b6f6efedadc003521cd0e5809f81da (patch) | |
| tree | f9206ef5df2fdeaa8301aad03e44d615febb1396 /src/feature/dirauth | |
| parent | 59008c6f515cb63b12061a24a9c4ddf0dc018e7f (diff) | |
| parent | bab8375ef5e4a917f9512e4250c52a45d33fb9ba (diff) | |
| download | tor-0a49e04691b6f6efedadc003521cd0e5809f81da.tar.gz tor-0a49e04691b6f6efedadc003521cd0e5809f81da.zip | |
Merge branch 'tor-gitlab/mr/635' into 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 cdd2c132ef..1bb4fd7de1 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -2302,8 +2302,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; |