summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-03-24 21:57:45 +0000
committerRoger Dingledine <arma@torproject.org>2005-03-24 21:57:45 +0000
commit4abb54a876e2da7f0706975237908df553eb75a6 (patch)
tree36814ac70a06baef471fb82d88a0180b1a5d890d
parent4dc570bf605f0fabc52f1511c35672eaed421543 (diff)
downloadtor-4abb54a876e2da7f0706975237908df553eb75a6.tar.gz
tor-4abb54a876e2da7f0706975237908df553eb75a6.zip
forward-port the circuit_resume_edge_reading_helper fix.
svn:r3863
-rw-r--r--src/or/relay.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/relay.c b/src/or/relay.c
index 60ff492867..7135569bbf 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1110,6 +1110,8 @@ circuit_resume_edge_reading_helper(connection_t *conn,
crypt_path_t *layer_hint) {
for ( ; conn; conn=conn->next_stream) {
+ if (conn->marked_for_close)
+ continue;
if ((!layer_hint && conn->package_window > 0) ||
(layer_hint && conn->package_window > 0 && conn->cpath_layer == layer_hint)) {
connection_start_reading(conn);