summaryrefslogtreecommitdiff
path: root/src/or/nodelist.c
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.c
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.c')
-rw-r--r--src/or/nodelist.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 0ef9741243..3ac5c3e302 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -1332,7 +1332,7 @@ nodelist_refresh_countries(void)
/** Return true iff router1 and router2 have similar enough network addresses
* that we should treat them as being in the same family */
-static inline int
+int
addrs_in_same_network_family(const tor_addr_t *a1,
const tor_addr_t *a2)
{