diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-07-07 11:17:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-07-07 11:17:53 -0400 |
| commit | c387cc5022f84ebb452278747f36f1c7d8b32187 (patch) | |
| tree | ec53450a1b17bca3e679552c9475c5464c4e57f9 /src/or/connection.c | |
| parent | aa792fd20a2a26c5bd4bb4a2d62ab89bcc55f2c5 (diff) | |
| parent | 6a64563b1d608dbc09f38b50cc47d0ae2de7836d (diff) | |
| download | tor-c387cc5022f84ebb452278747f36f1c7d8b32187.tar.gz tor-c387cc5022f84ebb452278747f36f1c7d8b32187.zip | |
Merge branch 'ticket21859_032_01_squashed'
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 4e890497e9..5c65e886c0 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -84,6 +84,7 @@ #include "geoip.h" #include "main.h" #include "hs_common.h" +#include "hs_ident.h" #include "nodelist.h" #include "policies.h" #include "reasons.h" @@ -605,6 +606,7 @@ connection_free_(connection_t *conn) } if (CONN_IS_EDGE(conn)) { rend_data_free(TO_EDGE_CONN(conn)->rend_data); + hs_ident_edge_conn_free(TO_EDGE_CONN(conn)->hs_ident); } if (conn->type == CONN_TYPE_CONTROL) { control_connection_t *control_conn = TO_CONTROL_CONN(conn); @@ -636,6 +638,7 @@ connection_free_(connection_t *conn) } rend_data_free(dir_conn->rend_data); + hs_ident_dir_conn_free(dir_conn->hs_ident); if (dir_conn->guard_state) { /* Cancel before freeing, if it's still there. */ entry_guard_cancel(&dir_conn->guard_state); |