aboutsummaryrefslogtreecommitdiff
path: root/src/app/config
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/app/config
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/app/config')
-rw-r--r--src/app/config/quiet_level.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/app/config/quiet_level.c b/src/app/config/quiet_level.c
index 4e17978228..e04faaef3a 100644
--- a/src/app/config/quiet_level.c
+++ b/src/app/config/quiet_level.c
@@ -31,7 +31,7 @@ add_default_log_for_quiet_level(quiet_level_t quiet)
/* --hush: log at warning or higher. */
add_default_log(LOG_WARN);
break;
- case QUIET_NONE: /* fall through */
+ case QUIET_NONE: FALLTHROUGH;
default:
add_default_log(LOG_NOTICE);
}