summaryrefslogtreecommitdiff
path: root/src/or/control.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-11-27 12:54:57 -0500
committerNick Mathewson <nickm@torproject.org>2015-11-27 12:54:57 -0500
commit0a701e537778ac9da31049f4efebf7cb2bf9c285 (patch)
tree3f6bdd2a09a7bca70acaf9059c6f10ddb6c69d01 /src/or/control.c
parenta33e9f208ae088fa3d63147fad9fc23654ca7ae1 (diff)
downloadtor-0a701e537778ac9da31049f4efebf7cb2bf9c285.tar.gz
tor-0a701e537778ac9da31049f4efebf7cb2bf9c285.zip
More fixes/debugging attempts for 17659
Diffstat (limited to 'src/or/control.c')
-rw-r--r--src/or/control.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/control.c b/src/or/control.c
index f2eab7b352..34d03befa6 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -3011,6 +3011,7 @@ handle_control_attachstream(control_connection_t *conn, uint32_t len,
edge_conn->end_reason = 0;
if (tmpcirc)
circuit_detach_stream(tmpcirc, edge_conn);
+ CONNECTION_AP_EXPECT_NONPENDING(ap_conn);
TO_CONN(edge_conn)->state = AP_CONN_STATE_CONTROLLER_WAIT;
}