aboutsummaryrefslogtreecommitdiff
path: root/src/feature/nodelist/nodelist.h
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2021-02-03 08:54:40 -0500
committerDavid Goulet <dgoulet@torproject.org>2021-02-03 08:54:40 -0500
commite50648582b6e0bc7bb37edc08e7a4d67b50f2c53 (patch)
tree4f307e0019d357ecd0787d771006b6e7ce3d9c20 /src/feature/nodelist/nodelist.h
parent0f8195406e0a2a97a3167d4bb40484f4bd091289 (diff)
parentc2cee6c780a1329a6906e91dc6f7854635727691 (diff)
downloadtor-e50648582b6e0bc7bb37edc08e7a4d67b50f2c53.tar.gz
tor-e50648582b6e0bc7bb37edc08e7a4d67b50f2c53.zip
Merge branch 'maint-0.3.5' into maint-0.4.3
Diffstat (limited to 'src/feature/nodelist/nodelist.h')
-rw-r--r--src/feature/nodelist/nodelist.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/feature/nodelist/nodelist.h b/src/feature/nodelist/nodelist.h
index 1f111a0b99..14d631f39a 100644
--- a/src/feature/nodelist/nodelist.h
+++ b/src/feature/nodelist/nodelist.h
@@ -35,8 +35,7 @@ node_t *nodelist_add_microdesc(microdesc_t *md);
void nodelist_set_consensus(networkstatus_t *ns);
void nodelist_ensure_freshness(networkstatus_t *ns);
int nodelist_probably_contains_address(const tor_addr_t *addr);
-bool nodelist_reentry_probably_contains(const tor_addr_t *addr,
- uint16_t port);
+bool nodelist_reentry_contains(const tor_addr_t *addr, uint16_t port);
void nodelist_add_addr_to_address_set(const tor_addr_t *addr,
uint16_t or_port, uint16_t dir_port);