aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuituse.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-03-24 06:18:59 +0000
committerRoger Dingledine <arma@torproject.org>2005-03-24 06:18:59 +0000
commit09ef2b7e41922a09ab92c1006b8a55b472486ef5 (patch)
tree7a8e9268726e99e0ec700dd0064c0cf43687922f /src/or/circuituse.c
parent13fdf51bc18428b5cf5e504d61a44f08204d0e22 (diff)
downloadtor-09ef2b7e41922a09ab92c1006b8a55b472486ef5.tar
tor-09ef2b7e41922a09ab92c1006b8a55b472486ef5.tar.gz
cleanup so connection_ap_handshake_attach_chosen_circuit() always
gets open circs. svn:r3856
Diffstat (limited to 'src/or/circuituse.c')
-rw-r--r--src/or/circuituse.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index e9c20f59a..22b991681 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -991,9 +991,7 @@ connection_ap_handshake_attach_chosen_circuit(connection_t *conn,
conn->state == AP_CONN_STATE_CONTROLLER_WAIT);
tor_assert(conn->socks_request);
tor_assert(circ);
-
- if (circ->state != CIRCUIT_STATE_OPEN)
- return 0;
+ tor_assert(circ->state == CIRCUIT_STATE_OPEN);
conn->state = AP_CONN_STATE_CIRCUIT_WAIT;