[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm@xxxxxxxxxxxxxx]

commit df896ed6323f6f0493393f97e739501df8092e7f
Merge: f8dad5a07 fe2588a5a
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Jun 29 13:00:56 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

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

diff --cc src/or/routerlist.c
index 1bfbd9f67,95b39d357..203895c86
--- 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);
    }
  



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits