summaryrefslogtreecommitdiff
path: root/src/or/nodelist.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-02-16 09:48:11 -0500
committerNick Mathewson <nickm@torproject.org>2018-02-16 09:48:11 -0500
commit2bcd264a28e2d6bec1e806e779bf82435c9c7505 (patch)
treea134a572dd26adf0bef4cf6f2fad56b21c0032b4 /src/or/nodelist.h
parent3930ffdf63425c344e14c45cff6780108cfa038b (diff)
parentcb92d47deca15c44dd52cad6fc326520648c632e (diff)
downloadtor-2bcd264a28e2d6bec1e806e779bf82435c9c7505.tar.gz
tor-2bcd264a28e2d6bec1e806e779bf82435c9c7505.zip
Merge branch 'maint-0.2.9' into maint-0.3.1
Diffstat (limited to 'src/or/nodelist.h')
-rw-r--r--src/or/nodelist.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/nodelist.h b/src/or/nodelist.h
index 95ae778a5b..9cd66f60a2 100644
--- a/src/or/nodelist.h
+++ b/src/or/nodelist.h
@@ -22,6 +22,7 @@ const node_t *node_get_by_hex_id(const char *identity_digest);
node_t *nodelist_set_routerinfo(routerinfo_t *ri, routerinfo_t **ri_old_out);
node_t *nodelist_add_microdesc(microdesc_t *md);
void nodelist_set_consensus(networkstatus_t *ns);
+int nodelist_probably_contains_address(const tor_addr_t *addr);
void nodelist_remove_microdesc(const char *identity_digest, microdesc_t *md);
void nodelist_remove_routerinfo(routerinfo_t *ri);
@@ -131,5 +132,7 @@ void router_dir_info_changed(void);
const char *get_dir_info_status_string(void);
int count_loading_descriptors_progress(void);
+MOCK_DECL(int, get_estimated_address_per_node, (void));
+
#endif