nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

back out most of commit b7992d4f

Browse Source 
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.
This commit is contained in:
Roger Dingledine 2022-10-24 04:30:23 -04:00
parent e6899dcdf4
commit ea2ba4f5a8
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/feature/dirauth/dirauth_options.inc
View File

@ -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)

3
src/feature/dirauth/dirvote.c
View File

@ -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;