diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-05-06 16:55:41 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-05-06 16:55:41 -0400 |
| commit | 4a2347d2902c2688e766e4a83a5db69847b7b578 (patch) | |
| tree | 06b0cd924071039532e53cc5855d6c3bcdf3763e /src/core/or/channeltls.c | |
| parent | 42246f8c9aee97d3efb0b437369554a3fa6f6890 (diff) | |
| parent | c116728209e4ece3249564208e9387f67192a7f6 (diff) | |
| download | tor-4a2347d2902c2688e766e4a83a5db69847b7b578.tar.gz tor-4a2347d2902c2688e766e4a83a5db69847b7b578.zip | |
Merge branch 'maint-0.4.3'
Amazingly, this time we had no merge conflicts with "falls through" comments.
Diffstat (limited to 'src/core/or/channeltls.c')
| -rw-r--r-- | src/core/or/channeltls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c index 484727268c..e73340ca29 100644 --- a/src/core/or/channeltls.c +++ b/src/core/or/channeltls.c @@ -1238,7 +1238,7 @@ channel_tls_handle_var_cell(var_cell_t *var_cell, or_connection_t *conn) /* But that should be happening any longer've disabled bufferevents. */ tor_assert_nonfatal_unreached_once(); - /* fall through */ + FALLTHROUGH; case OR_CONN_STATE_TLS_SERVER_RENEGOTIATING: if (!(command_allowed_before_handshake(var_cell->command))) { log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, |