commit 573b6e4f2f532b77341e5307e23f3c6bf6bdc725 Merge: 81e529d23 8691046ac Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 22 09:37:31 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

src/or/connection_edge.c | 1 - 1 file changed, 1 deletion(-)

diff --cc src/or/connection_edge.c index 046369af6,003f84adb..a21002fca --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@@ -4185,6 -4165,4 +4185,5 @@@ connection_edge_free_all(void untried_pending_connections = 0; smartlist_free(pending_entry_connections); pending_entry_connections = NULL; + mainloop_event_free(attach_pending_entry_connections_ev); } -