summaryrefslogtreecommitdiff
path: root/src/or/routerlist.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-07-26 19:31:15 -0400
committerNick Mathewson <nickm@torproject.org>2016-07-26 19:31:15 -0400
commitf0488551e7be4e2d21a104903a86be993a240398 (patch)
tree4f55f21fb5c390355fb6b46ffd749302d3082e56 /src/or/routerlist.c
parent48d7dfb92fba64dc0b9c26306f509c09a9246187 (diff)
parent64bf6b70a889ee53978d70a2efc3c2a08a088826 (diff)
downloadtor-f0488551e7be4e2d21a104903a86be993a240398.tar.gz
tor-f0488551e7be4e2d21a104903a86be993a240398.zip
Merge branch 'bug19639_squashed'
Diffstat (limited to 'src/or/routerlist.c')
-rw-r--r--src/or/routerlist.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 6ea9d8b0d1..2fe8c3b629 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1870,7 +1870,7 @@ router_picked_poor_directory_log(const routerstatus_t *rs)
/* When iterating through the routerlist, can OR address/port preference
* and reachability checks be skipped?
*/
-static int
+int
router_skip_or_reachability(const or_options_t *options, int try_ip_pref)
{
/* Servers always have and prefer IPv4.