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

[nickm@xxxxxxxxxxxxxx]

commit 5ab23e03fa0a8bce11798cbf025139e9653b9be4
Merge: c08102ea7 df896ed63
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Jun 29 13:02:56 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

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

diff --cc src/or/routerlist.c
index 8788dc019,203895c86..97d83213a
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@@ -2764,7 -2761,9 +2764,8 @@@ frac_nodes_with_descriptors(const smart
        if (node_has_any_descriptor(node))
          n_with_descs++;
      });
 -
+     tor_free(bandwidths);
 -    return ((double)n_with_descs) / (double)smartlist_len(sl);
 +    return ((double)n_with_descs) / smartlist_len(sl);
    }
  
    present = 0.0;
@@@ -5819,4 -5818,4 +5820,3 @@@ refresh_all_country_info(void
  
    nodelist_refresh_countries();
  }
--



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