diff options
| author | Roger Dingledine <arma@torproject.org> | 2009-11-23 10:16:38 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2009-11-23 10:16:38 -0500 |
| commit | cee9a28d1e4e55fb239da38908b7280ffeef1c72 (patch) | |
| tree | bc3f092a73f79f5a07181ca32f78e688a9b5c5ec /src/or/circuitlist.c | |
| parent | 403f99eaa48b0374c9a21f624f81ecae521734b3 (diff) | |
| parent | a89f51c936f8bd3c2aef3e9472d5310c83dc8fa7 (diff) | |
| download | tor-cee9a28d1e4e55fb239da38908b7280ffeef1c72.tar.gz tor-cee9a28d1e4e55fb239da38908b7280ffeef1c72.zip | |
Merge commit 'origin/maint-0.2.1'
Diffstat (limited to 'src/or/circuitlist.c')
| -rw-r--r-- | src/or/circuitlist.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 3efeabe786..02bf925ba5 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1103,6 +1103,7 @@ _circuit_mark_for_close(circuit_t *circ, int reason, int line, edge_connection_t *conn; for (conn=or_circ->n_streams; conn; conn=conn->next_stream) connection_edge_destroy(or_circ->p_circ_id, conn); + or_circ->n_streams = NULL; while (or_circ->resolving_streams) { conn = or_circ->resolving_streams; @@ -1126,6 +1127,7 @@ _circuit_mark_for_close(circuit_t *circ, int reason, int line, edge_connection_t *conn; for (conn=ocirc->p_streams; conn; conn=conn->next_stream) connection_edge_destroy(circ->n_circ_id, conn); + ocirc->p_streams = NULL; } circ->marked_for_close = line; |