summaryrefslogtreecommitdiff
path: root/src/feature/rend
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-05-06 16:55:41 -0400
committerNick Mathewson <nickm@torproject.org>2020-05-06 16:55:41 -0400
commit4a2347d2902c2688e766e4a83a5db69847b7b578 (patch)
tree06b0cd924071039532e53cc5855d6c3bcdf3763e /src/feature/rend
parent42246f8c9aee97d3efb0b437369554a3fa6f6890 (diff)
parentc116728209e4ece3249564208e9387f67192a7f6 (diff)
downloadtor-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/feature/rend')
-rw-r--r--src/feature/rend/rendclient.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c
index cc55065fdd..09db7045fa 100644
--- a/src/feature/rend/rendclient.c
+++ b/src/feature/rend/rendclient.c
@@ -831,7 +831,7 @@ rend_client_report_intro_point_failure(extend_info_t *failed_intro,
log_warn(LD_BUG, "Unknown failure type %u. Removing intro point.",
failure_type);
tor_fragile_assert();
- /* fall through */
+ FALLTHROUGH;
case INTRO_POINT_FAILURE_GENERIC:
rend_cache_intro_failure_note(failure_type,
(uint8_t *)failed_intro->identity_digest,