diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-01-11 14:37:28 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-01-11 14:37:28 -0500 |
| commit | 4b39f46a611ff48ceb7ea212dbcdb2e5b6d26d3b (patch) | |
| tree | 1b02a2c4b14d2145039a841006d64e95f1c78dd2 /src/feature/client | |
| parent | 2e7cbd7a9c4672d334a5900be2d2f4be26e603a3 (diff) | |
| parent | 6c0f15500b3aa027c90d1c397d4504bb2f4dd41b (diff) | |
| download | tor-4b39f46a611ff48ceb7ea212dbcdb2e5b6d26d3b.tar.gz tor-4b39f46a611ff48ceb7ea212dbcdb2e5b6d26d3b.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.3
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 148e6471ba..887af312d3 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -2263,7 +2263,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 |