From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 29 Jun 2018 17:03:00 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.1-alpha~287
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a5be3c5e76a9ce07c64499b6cb8a6bad9323113;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

1a5be3c5e76a9ce07c64499b6cb8a6bad9323113
diff --cc src/or/routerlist.c
index 68fd763441,97d83213af..98e1f69bb8
--- 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);
    }