diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-10-13 13:08:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-10-13 13:08:46 -0400 |
| commit | a0c1c2ac012fded493c0d8c49fe57e56373b061f (patch) | |
| tree | b39fcdda6348700e02ce17c18b3221c0b1f64fcd /src/or/main.c | |
| parent | 5710d99f00b3ac7cef0691fc9153993b0f4aa872 (diff) | |
| download | tor-a0c1c2ac012fded493c0d8c49fe57e56373b061f.tar.gz tor-a0c1c2ac012fded493c0d8c49fe57e56373b061f.zip | |
Use connection_mark_and_flush consistently.
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c index ddd5da3643..2562c21cdc 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -949,8 +949,7 @@ run_connection_housekeeping(int i, time_t now) connection_or_connect_failed(TO_OR_CONN(conn), END_OR_CONN_REASON_TIMEOUT, "Tor gave up on the connection"); - connection_mark_for_close(conn); - conn->hold_open_until_flushed = 1; + connection_mark_and_flush(conn); } else if (!connection_state_is_open(conn)) { if (past_keepalive) { /* We never managed to actually get this connection open and happy. */ |