diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-01-19 12:45:07 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-01-19 12:45:07 -0500 |
| commit | a22bfe04bcb106b14e2416e39dc9f43dc82eeba0 (patch) | |
| tree | 632a0aa411f829d9cd41363779c84158091ab755 /src/core | |
| parent | 17eb6355320c414d83cbc3c1930ec54ae7cd1ea4 (diff) | |
| parent | 2d5b21598ea04b3beb59cb678d8b438b27c45ee1 (diff) | |
| download | tor-a22bfe04bcb106b14e2416e39dc9f43dc82eeba0.tar.gz tor-a22bfe04bcb106b14e2416e39dc9f43dc82eeba0.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.3
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/or/channeltls.c | 4 | ||||
| -rw-r--r-- | src/core/or/circuitlist.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c index 1ef9746313..8a087298de 100644 --- a/src/core/or/channeltls.c +++ b/src/core/or/channeltls.c @@ -1225,9 +1225,7 @@ 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 + FALLTHROUGH_UNLESS_ALL_BUGS_ARE_FATAL; case OR_CONN_STATE_TLS_SERVER_RENEGOTIATING: if (!(command_allowed_before_handshake(var_cell->command))) { log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c index b60741245d..6f07132e22 100644 --- a/src/core/or/circuitlist.c +++ b/src/core/or/circuitlist.c @@ -846,9 +846,7 @@ circuit_purpose_to_controller_hs_state_string(uint8_t purpose) "Unrecognized circuit purpose: %d", (int)purpose); tor_fragile_assert(); -#ifndef ALL_BUGS_ARE_FATAL - FALLTHROUGH; -#endif + FALLTHROUGH_UNLESS_ALL_BUGS_ARE_FATAL; case CIRCUIT_PURPOSE_OR: case CIRCUIT_PURPOSE_C_GENERAL: |