nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug21495'

Browse Source
This commit is contained in:
Nick Mathewson 2017-07-07 13:03:36 -04:00
commit eb01f35149
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/dirvote.c
View File

@ -737,13 +737,13 @@ dirvote_get_intermediate_param_value(const smartlist_t *param_list,
} }
} SMARTLIST_FOREACH_END(k_v_pair); } SMARTLIST_FOREACH_END(k_v_pair);
if (n_found == 1) if (n_found == 1) {
return value; return value;
else if (BUG(n_found > 1)) } else {
return default_val; tor_assert_nonfatal(n_found == 0);
else
return default_val; return default_val;
} }
}
/** Minimum number of directory authorities voting for a parameter to /** Minimum number of directory authorities voting for a parameter to
* include it in the consensus, if consensus method 12 or later is to be * include it in the consensus, if consensus method 12 or later is to be