From: Nick Mathewson Date: Wed, 7 Sep 2011 18:18:32 +0000 (-0400) Subject: Remove a now-needless test. X-Git-Tag: tor-0.2.3.4-alpha~20 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d27874a4f22c7c1ad7b1c28f418f09ce268bb3a4;p=thirdparty%2Ftor.git Remove a now-needless test. --- diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 39a50abafb..a66f3406cf 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2653,8 +2653,7 @@ ap_stream_wants_exit_attention(connection_t *conn) return 0; entry = TO_ENTRY_CONN(conn); - if (conn->type == CONN_TYPE_AP && - conn->state == AP_CONN_STATE_CIRCUIT_WAIT && + if (conn->state == AP_CONN_STATE_CIRCUIT_WAIT && !conn->marked_for_close && !(entry->want_onehop) && /* ignore one-hop streams */ !(entry->use_begindir) && /* ignore targeted dir fetches */