[tor-commits] [tor/master] Revert "Avoid a double-mark in connection_or_close_connection_cb"

[nickm at torproject.org]

commit 3a17a1a62f242f3aa64891407d3d64aa040d6d02
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 6 19:49:20 2011 -0500

    Revert "Avoid a double-mark in connection_or_close_connection_cb"
    
    This reverts commit 633071eb3bcf2c4106e93de28d727594bd23b1db.
---
 src/or/connection_or.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 82297c3..44f559c 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1162,12 +1162,10 @@ connection_or_tls_renegotiated_cb(tor_tls_t *tls, void *_conn)
 static void
 connection_or_close_connection_cb(void *_conn)
 {
-  or_connection_t *or_conn = _conn;
-  connection_t *conn = TO_CONN(or_conn);
+  or_connection_t *conn = _conn;
 
-  connection_stop_reading(conn);
-  if (!conn->marked_for_close)
-    connection_mark_for_close(conn);
+  connection_stop_reading(TO_CONN(conn));
+  connection_mark_for_close(TO_CONN(conn));
 }
 
 /** Move forward with the tls handshake. If it finishes, hand