diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-01-19 12:49:22 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-01-19 12:49:22 -0500 |
| commit | 4c82c2d1d4a9800f82bcc47c227a8e6a2a0d168d (patch) | |
| tree | 01485c268d706df11a9e22fa6e137836e8e29497 /src/feature/client | |
| parent | 61ee17eb1e3b0c7b92bfa80f3f0f7cbb986db71b (diff) | |
| parent | a22bfe04bcb106b14e2416e39dc9f43dc82eeba0 (diff) | |
| download | tor-4c82c2d1d4a9800f82bcc47c227a8e6a2a0d168d.tar.gz tor-4c82c2d1d4a9800f82bcc47c227a8e6a2a0d168d.zip | |
Merge branch 'maint-0.4.3' into maint-0.4.4
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 400bcd9af2..70ef64cc86 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 |