forward-port the circuit_resume_edge_reading_helper fix.

svn:r3863

diff --git a/src/or/relay.c b/src/or/relay.c
index 60ff4928675d508e52af331d65141c06fe33dd16..7135569bbf51bf9245057faadb952d93ef9ea6a6 100644 (file)
--- 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);