diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-07-07 13:03:36 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-07-07 13:03:36 -0400 |
| commit | eb01f35149d9222922fee2bb51a6246d58f7d25f (patch) | |
| tree | efd93faebf0337f31e0a2e889dd9e1b61c153958 /src | |
| parent | c7d2a67274549e71381f87c2fd3e8adad1c1abc9 (diff) | |
| parent | 67b6ba6f2f2cb95ab534052a0e25eb4f5185e41c (diff) | |
| download | tor-eb01f35149d9222922fee2bb51a6246d58f7d25f.tar.gz tor-eb01f35149d9222922fee2bb51a6246d58f7d25f.zip | |
Merge branch 'bug21495'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/dirvote.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c index f5e29eb786..11cd020d88 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -737,12 +737,12 @@ dirvote_get_intermediate_param_value(const smartlist_t *param_list, } } SMARTLIST_FOREACH_END(k_v_pair); - if (n_found == 1) + if (n_found == 1) { return value; - else if (BUG(n_found > 1)) - return default_val; - else + } else { + tor_assert_nonfatal(n_found == 0); return default_val; + } } /** Minimum number of directory authorities voting for a parameter to |