From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 9 Jul 2018 14:17:20 +0000 (-0400)
Subject: Merge branch 'maint-0.3.3' into maint-0.3.4
X-Git-Tag: tor-0.3.4.4-rc~4^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=98dff5df3fd22be0a7a084dace22b218243e5164;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.3' into maint-0.3.4
---

98dff5df3fd22be0a7a084dace22b218243e5164
diff --cc src/test/test_entrynodes.c
index cfcb88a66e,505e09e36f..d8bd8e328b
--- 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);