diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-08 16:49:24 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-08 16:49:24 -0500 |
| commit | e93234af70da5cf3d513e57b12e4934b1c4d9529 (patch) | |
| tree | e8c72b7f9a1cbbedd154444bdb23b54c051c48ea /src/or/connection.c | |
| parent | e33c85a450c4819cdad30acfc280aece7c521d6e (diff) | |
| parent | 236e8b605e6aebf87787951ca05f5c75ad530c8a (diff) | |
| download | tor-e93234af70da5cf3d513e57b12e4934b1c4d9529.tar.gz tor-e93234af70da5cf3d513e57b12e4934b1c4d9529.zip | |
Merge branch 'feature15056_v1_squashed'
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index bdf14bb2fc..ac3408a72e 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -644,7 +644,7 @@ connection_free_(connection_t *conn) if (conn->type == CONN_TYPE_OR && !tor_digest_is_zero(TO_OR_CONN(conn)->identity_digest)) { log_warn(LD_BUG, "called on OR conn with non-zeroed identity_digest"); - connection_or_remove_from_identity_map(TO_OR_CONN(conn)); + connection_or_clear_identity(TO_OR_CONN(conn)); } if (conn->type == CONN_TYPE_OR || conn->type == CONN_TYPE_EXT_OR) { connection_or_remove_from_ext_or_id_map(TO_OR_CONN(conn)); @@ -675,7 +675,7 @@ connection_free,(connection_t *conn)) } if (connection_speaks_cells(conn)) { if (!tor_digest_is_zero(TO_OR_CONN(conn)->identity_digest)) { - connection_or_remove_from_identity_map(TO_OR_CONN(conn)); + connection_or_clear_identity(TO_OR_CONN(conn)); } } if (conn->type == CONN_TYPE_CONTROL) { |