tor

commit eb01f35149d9222922fee2bb51a6246d58f7d25f
parent c7d2a67274549e71381f87c2fd3e8adad1c1abc9
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri,  7 Jul 2017 13:03:36 -0400

Merge branch 'bug21495'

Diffstat:
M
src/or/dirvote.c
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git 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