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

[nickm at torproject.org]

commit 98dff5df3fd22be0a7a084dace22b218243e5164
Merge: 529faef28 250e0fc1c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 9 10:17:20 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

 src/test/test_entrynodes.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --cc src/test/test_entrynodes.c
index cfcb88a66,505e09e36..d8bd8e328
--- a/src/test/test_entrynodes.c
+++ b/src/test/test_entrynodes.c
@@@ -1195,8 -1172,11 +1197,9 @@@ test_entry_guard_update_from_consensus_
       */
      entry_guard_t *g = smartlist_get(gs->sampled_entry_guards, 5);
      node_t *n = (node_t*) bfn_mock_node_get_by_id(g->identity);
+     tt_assert(n);
      smartlist_remove(big_fake_net_nodes, n);
 -    tor_free(n->rs);
 -    tor_free(n->md);
 -    tor_free(n);
 +    test_node_free(n);
    }
    update_approx_time(start + 300);
    sampled_guards_update_from_consensus(gs);