aboutsummaryrefslogtreecommitdiff
path: root/src/or/nodelist.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-06-29 15:57:48 -0400
committerNick Mathewson <nickm@torproject.org>2017-06-29 15:57:48 -0400
commit1712dc98b04ef7b84df67e02da21ea1aa70bc74c (patch)
tree8afe3757200bec46df6496e2763e6f196865359b /src/or/nodelist.h
parent31a08ba26fc5eaa12de6d3c5efa3aac4d00509d0 (diff)
parent52c4440c4895cb90dd155bb094b49a97128baedf (diff)
downloadtor-1712dc98b04ef7b84df67e02da21ea1aa70bc74c.tar.gz
tor-1712dc98b04ef7b84df67e02da21ea1aa70bc74c.zip
Merge branch 'maint-0.3.0' into maint-0.3.1
Diffstat (limited to 'src/or/nodelist.h')
-rw-r--r--src/or/nodelist.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/nodelist.h b/src/or/nodelist.h
index 6c063de8a3..95ae778a5b 100644
--- a/src/or/nodelist.h
+++ b/src/or/nodelist.h
@@ -93,6 +93,8 @@ int node_is_unreliable(const node_t *router, int need_uptime,
int router_exit_policy_all_nodes_reject(const tor_addr_t *addr, uint16_t port,
int need_uptime);
void router_set_status(const char *digest, int up);
+int addrs_in_same_network_family(const tor_addr_t *a1,
+ const tor_addr_t *a2);
/** router_have_minimum_dir_info tests to see if we have enough
* descriptor information to create circuits.