aboutsummaryrefslogtreecommitdiff
path: root/src/or/routerlist.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-09-14 22:19:25 -0400
committerNick Mathewson <nickm@torproject.org>2010-09-14 22:19:25 -0400
commit60e3def3ed7428b139cfd6e36517f930a84bd085 (patch)
tree9ebca5d98cc88cb8efebf448598797ca5364b863 /src/or/routerlist.h
parente2b71d884139af902fc9b9222f5b55fe5a7a91ec (diff)
parentf5b7e039f39d881fc8f48c2e6004e605ca0e24c1 (diff)
downloadtor-60e3def3ed7428b139cfd6e36517f930a84bd085.tar.gz
tor-60e3def3ed7428b139cfd6e36517f930a84bd085.zip
Merge branch 'bug1899'
Diffstat (limited to 'src/or/routerlist.h')
-rw-r--r--src/or/routerlist.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/routerlist.h b/src/or/routerlist.h
index b53997ae8f..574bce7ffc 100644
--- a/src/or/routerlist.h
+++ b/src/or/routerlist.h
@@ -36,6 +36,7 @@ int router_get_my_share_of_directory_requests(double *v2_share_out,
void router_reset_status_download_failures(void);
void routerlist_add_family(smartlist_t *sl, routerinfo_t *router);
int routers_in_same_family(routerinfo_t *r1, routerinfo_t *r2);
+int routers_have_same_or_addr(const routerinfo_t *r1, const routerinfo_t *r2);
void add_nickname_list_to_smartlist(smartlist_t *sl, const char *list,
int must_be_running);
int router_nickname_is_in_list(routerinfo_t *router, const char *list);