diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-01-11 14:37:28 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-01-11 14:37:28 -0500 |
| commit | 4b39f46a611ff48ceb7ea212dbcdb2e5b6d26d3b (patch) | |
| tree | 1b02a2c4b14d2145039a841006d64e95f1c78dd2 /src/core/or/channeltls.c | |
| parent | 2e7cbd7a9c4672d334a5900be2d2f4be26e603a3 (diff) | |
| parent | 6c0f15500b3aa027c90d1c397d4504bb2f4dd41b (diff) | |
| download | tor-4b39f46a611ff48ceb7ea212dbcdb2e5b6d26d3b.tar.gz tor-4b39f46a611ff48ceb7ea212dbcdb2e5b6d26d3b.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.3
Diffstat (limited to 'src/core/or/channeltls.c')
| -rw-r--r-- | src/core/or/channeltls.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c index 5f3d038730..1ef9746313 100644 --- a/src/core/or/channeltls.c +++ b/src/core/or/channeltls.c @@ -1225,8 +1225,9 @@ channel_tls_handle_var_cell(var_cell_t *var_cell, or_connection_t *conn) * the v2 and v3 handshakes. */ /* But that should be happening any longer've disabled bufferevents. */ tor_assert_nonfatal_unreached_once(); - +#ifndef ALL_BUGS_ARE_FATAL FALLTHROUGH; +#endif case OR_CONN_STATE_TLS_SERVER_RENEGOTIATING: if (!(command_allowed_before_handshake(var_cell->command))) { log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, |