summaryrefslogtreecommitdiff
path: root/src/or/channeltls.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-06-21 16:47:55 -0400
committerNick Mathewson <nickm@torproject.org>2017-06-21 16:47:55 -0400
commit3a8a92fddd7a21b8e6b0b5a463e86639f1d04fc8 (patch)
treeeeaf31754cc5042d35821a848f4045f4501bc019 /src/or/channeltls.c
parent5d3f484f4ac4f45c0404b1f8b998983636f2a693 (diff)
parent1c0a2335cd27ed4f4a61f99ce19b5ba08639eeff (diff)
downloadtor-3a8a92fddd7a21b8e6b0b5a463e86639f1d04fc8.tar.gz
tor-3a8a92fddd7a21b8e6b0b5a463e86639f1d04fc8.zip
Merge branch 'callgraph_reduction_v2'
Diffstat (limited to 'src/or/channeltls.c')
-rw-r--r--src/or/channeltls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index f44e4fc8ea..707dd5ba8e 100644
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@ -993,7 +993,7 @@ channel_tls_handle_state_change_on_orconn(channel_tls_t *chan,
* We can go to CHANNEL_STATE_OPEN from CHANNEL_STATE_OPENING or
* CHANNEL_STATE_MAINT on this.
*/
- channel_change_state(base_chan, CHANNEL_STATE_OPEN);
+ channel_change_state_open(base_chan);
/* We might have just become writeable; check and tell the scheduler */
if (connection_or_num_cells_writeable(conn) > 0) {
scheduler_channel_wants_writes(base_chan);