Merge remote-tracking branch 'tor-gitlab/mr/442' into main

changes/bug40471

@@ -0,0 +1,4 @@
+  o Minor bugfixes (dirauth, bandwidth scanner):
+    - Add the AuthDirDontVoteOnDirAuthBandwidth dirauth config parameter to
+      avoid voting on bandwidth scanner weights to v3 directory authorities.
+      Fixes bug 40471; bugfix on 0.2.2.1-alpha. Patch by Neel Chauhan.

src/feature/dirauth/dirauth_options.inc

@@ -109,4 +109,7 @@ 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)

src/feature/dirauth/dirvote.c

@@ -2265,7 +2265,8 @@ 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) {
+      if (rs_out.has_bandwidth && (!rs_out.is_authority ||
+          !dirauth_get_options()->AuthDirDontVoteOnDirAuthBandwidth)) {
         char *guardfraction_str = NULL;
         int unmeasured = rs_out.bw_is_unmeasured;