diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-01-11 14:37:29 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-01-11 14:37:29 -0500 |
| commit | 5a822b462aaa8cf3cd749c253bb1e9e5f4f37fa2 (patch) | |
| tree | 76e9f3eba8dab735e217553ad93052cbdad8a766 /src/feature/client | |
| parent | 77bb4b0838da1d1c1cb7d2d47b02954abeb00a21 (diff) | |
| parent | 4b39f46a611ff48ceb7ea212dbcdb2e5b6d26d3b (diff) | |
| download | tor-5a822b462aaa8cf3cd749c253bb1e9e5f4f37fa2.tar.gz tor-5a822b462aaa8cf3cd749c253bb1e9e5f4f37fa2.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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index 45e484540c..400bcd9af2 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -2317,7 +2317,9 @@ entry_guards_note_guard_success(guard_selection_t *gs, break; default: tor_assert_nonfatal_unreached(); +#ifndef ALL_BUGS_ARE_FATAL FALLTHROUGH; +#endif 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 |