aboutsummaryrefslogtreecommitdiff
path: root/src/feature/relay
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-05-06 16:47:03 -0400
committerNick Mathewson <nickm@torproject.org>2020-05-06 16:47:03 -0400
commitd04b708b4bd47ee8df6796f19b25f558b2b18e91 (patch)
tree3eb744174d8e923fed56b4714244b94ed70c94b9 /src/feature/relay
parentbbfc498e21c9854b16b0543bf3f3f4ac304711f7 (diff)
parent28f453c4764962394bf0cd3a314b2b60af7ee1b4 (diff)
downloadtor-d04b708b4bd47ee8df6796f19b25f558b2b18e91.tar.gz
tor-d04b708b4bd47ee8df6796f19b25f558b2b18e91.zip
Merge branch 'maint-0.4.1' into maint-0.4.2
Diffstat (limited to 'src/feature/relay')
-rw-r--r--src/feature/relay/dns.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c
index 05b97e0ae2..d9662962d2 100644
--- a/src/feature/relay/dns.c
+++ b/src/feature/relay/dns.c
@@ -546,7 +546,7 @@ send_resolved_cell,(edge_connection_t *conn, uint8_t answer_type,
break;
} else {
answer_type = RESOLVED_TYPE_ERROR;
- /* fall through. */
+ /* We let this fall through and treat it as an error. */
}
/* Falls through. */
case RESOLVED_TYPE_ERROR_TRANSIENT: