1 files changed, 5 insertions, 1 deletions
diff --git a/src/or/relay.c b/src/or/relay.c
index e95235f89..b74a3401b 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -694,7 +694,11 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ,
 #else
       /* We just *got* an end; no reason to send one. */
       conn->has_sent_end = 1;
-      connection_mark_for_close(conn);
+      if(!conn->marked_for_close) {
+        /* only mark it if not already marked. it's possible to
+         * get the 'end' right around when the client hangs up on us. */
+        connection_mark_for_close(conn);
+      }
       conn->hold_open_until_flushed = 1;
 #endif
       return 0;