diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-05-06 16:47:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-05-06 16:47:03 -0400 |
| commit | d04b708b4bd47ee8df6796f19b25f558b2b18e91 (patch) | |
| tree | 3eb744174d8e923fed56b4714244b94ed70c94b9 /src/feature | |
| parent | bbfc498e21c9854b16b0543bf3f3f4ac304711f7 (diff) | |
| parent | 28f453c4764962394bf0cd3a314b2b60af7ee1b4 (diff) | |
| download | tor-d04b708b4bd47ee8df6796f19b25f558b2b18e91.tar.gz tor-d04b708b4bd47ee8df6796f19b25f558b2b18e91.zip | |
Merge branch 'maint-0.4.1' into maint-0.4.2
Diffstat (limited to 'src/feature')
| -rw-r--r-- | src/feature/dirauth/keypin.c | 2 | ||||
| -rw-r--r-- | src/feature/relay/dns.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/feature/dirauth/keypin.c b/src/feature/dirauth/keypin.c index 3ca2c3ef91..316b7d6c2f 100644 --- a/src/feature/dirauth/keypin.c +++ b/src/feature/dirauth/keypin.c @@ -267,7 +267,7 @@ keypin_add_or_replace_entry_in_map(keypin_ent_t *ent) } tor_free(ent2); r = -1; - /* Fall through */ + /* Note lack of return here: we fall through to the next line. */ } keypin_add_entry_to_map(ent); 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: |