commit aab7d666cd51fdccdb735f7fa2c59f93d0c450e9 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 11 09:55:47 2015 -0400

Add a log message to try to track down #16013 --- src/or/circuituse.c | 6 ++++++ 1 file changed, 6 insertions(+)

diff --git a/src/or/circuituse.c b/src/or/circuituse.c index a429a7d..28c70ad 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1843,6 +1843,12 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn,

tor_assert(conn); tor_assert(circp); + if (ENTRY_TO_CONN(conn)->state != AP_CONN_STATE_CIRCUIT_WAIT) { + connection_t *c = ENTRY_TO_CONN(conn); + log_err(LD_BUG, "Connection state mismatch: wanted " + "AP_CONN_STATE_CIRCUIT_WAIT, but got %d (%s)", + c->state, conn_state_to_string(c->type, c->state)); + } tor_assert(ENTRY_TO_CONN(conn)->state == AP_CONN_STATE_CIRCUIT_WAIT); check_exit_policy = conn->socks_request->command == SOCKS_COMMAND_CONNECT &&