From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 29 Jun 2018 17:00:56 +0000 (-0400)
Subject: Merge branch 'maint-0.3.2' into maint-0.3.3
X-Git-Tag: tor-0.3.3.8~14^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=df896ed6323f6f0493393f97e739501df8092e7f;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.2' into maint-0.3.3
---

df896ed6323f6f0493393f97e739501df8092e7f
diff --cc src/or/routerlist.c
index 1bfbd9f670,95b39d3571..203895c867
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@@ -2758,9 -2755,11 +2758,11 @@@ frac_nodes_with_descriptors(const smart
        total <= 0.0) {
      int n_with_descs = 0;
      SMARTLIST_FOREACH(sl, const node_t *, node, {
 -      if (node_has_descriptor(node))
 +      if (node_has_any_descriptor(node))
          n_with_descs++;
      });
+ 
+     tor_free(bandwidths);
      return ((double)n_with_descs) / (double)smartlist_len(sl);
    }