diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-08-12 16:11:28 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-08-12 16:11:28 -0400 |
| commit | 7f145b54afb2cb1d9390a65bf31e2dddeb5b87da (patch) | |
| tree | f184f7c342e95e36a6b80e2c7fddde7f76c3aa7e /src/or/channeltls.c | |
| parent | 14d58bbb4a9f08d51a58ea0a75d5535a05bfc9e8 (diff) | |
| parent | bbc9cbd95839380a45ec9ff11a7f7b99bbe923b0 (diff) | |
| download | tor-7f145b54afb2cb1d9390a65bf31e2dddeb5b87da.tar.gz tor-7f145b54afb2cb1d9390a65bf31e2dddeb5b87da.zip | |
Merge remote-tracking branch 'public/Fix_19450'
Diffstat (limited to 'src/or/channeltls.c')
| -rw-r--r-- | src/or/channeltls.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/channeltls.c b/src/or/channeltls.c index fb0e7c566b..a62f80ef91 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1192,6 +1192,8 @@ channel_tls_handle_var_cell(var_cell_t *var_cell, or_connection_t *conn) * notice "hey, data arrived!" before we notice "hey, the handshake * finished!" And we need to be accepting both at once to handle both * the v2 and v3 handshakes. */ + /* But that should be happening any longer've disabled bufferevents. */ + tor_assert_nonfatal_unreached_once(); /* fall through */ case OR_CONN_STATE_TLS_SERVER_RENEGOTIATING: |