[tor-commits] [tor/master] Use connection_mark_for_close() rather than connection_mark_on_flush() on OOS

[nickm at torproject.org]

commit 9a09513c0bd54abae3317be4136cf2578e11fbf3
Author: Andrea Shepard <andrea at torproject.org>
Date:   Sat Aug 20 04:43:01 2016 +0000

    Use connection_mark_for_close() rather than connection_mark_on_flush() on OOS
---
 src/or/connection.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/connection.c b/src/or/connection.c
index daa11ee..9b583f4 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -4653,12 +4653,12 @@ kill_conn_list_for_oos, (smartlist_t *conns))
     if (c->type == CONN_TYPE_OR) {
       connection_or_close_for_error(TO_OR_CONN(c), 1);
     } else {
-      connection_mark_and_flush(c);
+      connection_mark_for_close(c);
     }
   } SMARTLIST_FOREACH_END(c);
 
   log_notice(LD_NET,
-             "OOS handler marked and flushed %d connections",
+             "OOS handler marked %d connections",
              smartlist_len(conns));
 }