aboutsummaryrefslogtreecommitdiff
path: root/src/feature/dirclient
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/dirclient
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/dirclient')
-rw-r--r--src/feature/dirclient/dirclient.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/feature/dirclient/dirclient.c b/src/feature/dirclient/dirclient.c
index 2072dddadd..5388209f67 100644
--- a/src/feature/dirclient/dirclient.c
+++ b/src/feature/dirclient/dirclient.c
@@ -1367,7 +1367,7 @@ directory_initiate_request,(directory_request_t *request))
case 1:
/* start flushing conn */
conn->base_.state = DIR_CONN_STATE_CLIENT_SENDING;
- /* fall through */
+ FALLTHROUGH;
case 0:
/* queue the command on the outbuf */
directory_send_command(conn, 1, request);