tor

commit ea2ba4f5a89e60ef1b9d589b8a9013ba9cd87e77
parent e6899dcdf4aad5683e649ef36052b2cc89c6892a
Author: Roger Dingledine <arma@torproject.org>
Date:   Mon, 24 Oct 2022 04:30:23 -0400

back out most of commit b7992d4f

The AuthDirDontVoteOnDirAuthBandwidth torrc option never worked, and it
was implemented in a way that could have produced consensus conflicts
if it had.

Resolves bug 40700.

Diffstat:
M
src/feature/dirauth/dirauth_options.inc
 | 
3
---
M
src/feature/dirauth/dirvote.c
 | 
3
+--

2 files changed, 1 insertion(+), 5 deletions(-)
diff --git 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
@@ -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;