commit 573b6e4f2f532b77341e5307e23f3c6bf6bdc725 parent 81e529d236f41607b133c5562e2d5887fcfd5b8a Author: Nick Mathewson <nickm@torproject.org> Date: Wed, 22 Aug 2018 09:37:31 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 Diffstat:
| M | src/or/connection_edge.c | | | 1 | - |
1 file changed, 0 insertions(+), 1 deletion(-)
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c @@ -4187,4 +4187,3 @@ connection_edge_free_all(void) pending_entry_connections = NULL; mainloop_event_free(attach_pending_entry_connections_ev); } -