summaryrefslogtreecommitdiff
path: root/src/or/circuitlist.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-01-31 03:47:38 +0000
committerRoger Dingledine <arma@torproject.org>2005-01-31 03:47:38 +0000
commita7138f253515fbfb673045da3949297adc74ea23 (patch)
tree0ffaa7a92c3d437b13cafdfe59c34e7e2301a3c6 /src/or/circuitlist.c
parenta0312f3590defdccf3d8f6e88203a4377ad9d63d (diff)
downloadtor-a7138f253515fbfb673045da3949297adc74ea23.tar.gz
tor-a7138f253515fbfb673045da3949297adc74ea23.zip
fix another rogue connection_free that was causing us troubles
there are no doubt more lurking. svn:r3478
Diffstat (limited to 'src/or/circuitlist.c')
-rw-r--r--src/or/circuitlist.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 4eabb9810b..5e17eb7a4e 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -378,9 +378,8 @@ int _circuit_mark_for_close(circuit_t *circ) {
while (circ->resolving_streams) {
conn = circ->resolving_streams;
circ->resolving_streams = conn->next_stream;
- connection_dns_remove(conn); /* remove it from resolve lists */
- log_fn(LOG_INFO,"Freeing resolving-conn.");
- connection_free(conn);
+ if (!conn->marked_for_close)
+ connection_mark_for_close(conn);
}
if (circ->p_conn)
connection_send_destroy(circ->p_circ_id, circ->p_conn);