Merge branch 'maint-0.3.3' into maint-0.3.4

diff --cc src/test/test_entrynodes.c
index cfcb88a66e66c696b430a6a4c87ff0ddf4f76929,505e09e36f26a5b86d6531aec1fa2f89773b06a4..d8bd8e328bed1f32d7d9650a61f2de6d277736c5
--- 1/src/test/test_entrynodes.c
--- 2/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);