diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-01-19 12:49:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-01-19 12:49:31 -0500 |
| commit | 5f53e013cd33f1f707a1b06653290e03bc2db095 (patch) | |
| tree | 2c68d1d76bcf8256b761023af7addbfb2bc4e837 /src/feature/client | |
| parent | 4961645254a7cb1bc0a64947995a3ec2d77bffb0 (diff) | |
| parent | 6c1bc570cf49c8e493d3278fefaf0c77e289f82c (diff) | |
| download | tor-5f53e013cd33f1f707a1b06653290e03bc2db095.tar.gz tor-5f53e013cd33f1f707a1b06653290e03bc2db095.zip | |
Merge branch 'maint-0.4.5'
Diffstat (limited to 'src/feature/client')
| -rw-r--r-- | src/feature/client/entrynodes.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index c852aaf86d..409bed1a40 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -2317,9 +2317,7 @@ entry_guards_note_guard_success(guard_selection_t *gs, break; default: tor_assert_nonfatal_unreached(); -#ifndef ALL_BUGS_ARE_FATAL - FALLTHROUGH; -#endif + FALLTHROUGH_UNLESS_ALL_BUGS_ARE_FATAL; case GUARD_CIRC_STATE_USABLE_IF_NO_BETTER_GUARD: if (guard->is_primary) { /* XXXX #20832 -- I don't actually like this logic. It seems to make |