summaryrefslogtreecommitdiff
path: root/src/or/connection.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-03-28 19:55:18 +0200
committerNick Mathewson <nickm@torproject.org>2017-03-28 19:55:18 +0200
commit208c2a5c74e5ae4e53a9c6555f5519816826d490 (patch)
treed7b01b05afdeb890714c77391c7705a8e0727b23 /src/or/connection.c
parent4d5b46aad91daeafd9c3f9d703f3b0b7b47ad472 (diff)
parent003a7fe2a390615df9f700193ab0fe52fa4ade93 (diff)
downloadtor-208c2a5c74e5ae4e53a9c6555f5519816826d490.tar.gz
tor-208c2a5c74e5ae4e53a9c6555f5519816826d490.zip
Merge branch 'spooling_squashed'
Diffstat (limited to 'src/or/connection.c')
-rw-r--r--src/or/connection.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index f10623d868..09e316d214 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -629,12 +629,12 @@ connection_free_(connection_t *conn)
tor_free(dir_conn->requested_resource);
tor_zlib_free(dir_conn->zlib_state);
- if (dir_conn->fingerprint_stack) {
- SMARTLIST_FOREACH(dir_conn->fingerprint_stack, char *, cp, tor_free(cp));
- smartlist_free(dir_conn->fingerprint_stack);
+ if (dir_conn->spool) {
+ SMARTLIST_FOREACH(dir_conn->spool, spooled_resource_t *, spooled,
+ spooled_resource_free(spooled));
+ smartlist_free(dir_conn->spool);
}
- cached_dir_decref(dir_conn->cached_dir);
rend_data_free(dir_conn->rend_data);
if (dir_conn->guard_state) {
/* Cancel before freeing, if it's still there. */