commit 1a5be3c5e76a9ce07c64499b6cb8a6bad9323113 Merge: 9d5b815dc 5ab23e03f Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 29 13:03:00 2018 -0400

Merge branch 'maint-0.3.4'

src/or/dirauth/shared_random_state.c | 1 + src/or/routerlist.c | 1 + src/test/test_hs.c | 7 +++++-- src/test/test_shared_random.c | 1 + 4 files changed, 8 insertions(+), 2 deletions(-)

diff --cc src/or/routerlist.c index 68fd76344,97d83213a..98e1f69bb --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@@ -2781,9 -2761,10 +2781,10 @@@ frac_nodes_with_descriptors(const smart total <= 0.0) { int n_with_descs = 0; SMARTLIST_FOREACH(sl, const node_t *, node, { - if (node_has_any_descriptor(node)) + if (node_has_preferred_descriptor(node, for_direct_conn)) n_with_descs++; }); + tor_free(bandwidths); return ((double)n_with_descs) / smartlist_len(sl); }