diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-08-22 09:37:31 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-08-22 09:37:31 -0400 |
| commit | 1962a4ea9c79846c5172e8791db4410998a267f9 (patch) | |
| tree | 8fcab25f14973e73778b535fbae3d3b04b178edc | |
| parent | 9d64304bec7c6159bcd66f614e91c1a25df2e7e3 (diff) | |
| parent | 573b6e4f2f532b77341e5307e23f3c6bf6bdc725 (diff) | |
| download | tor-1962a4ea9c79846c5172e8791db4410998a267f9.tar.gz tor-1962a4ea9c79846c5172e8791db4410998a267f9.zip | |
Merge branch 'maint-0.3.4' into release-0.3.4
| -rw-r--r-- | src/or/connection_edge.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 046369af60..a21002fcad 100644 --- 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); } - |