summaryrefslogtreecommitdiff
path: root/src/or/routerlist.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-12-15 13:19:18 -0500
committerNick Mathewson <nickm@torproject.org>2015-12-15 13:19:18 -0500
commitaa4be914f06baa92857de201a212b9fc9856bdb1 (patch)
tree871c34479c39553c605eb5d8460aa9fc19bfe34c /src/or/routerlist.h
parent125e0c7022fa0bf7ac4d09e0a5a07db63bf529ea (diff)
parent60fc2b25392796ad7c42ee16f43b9b5787ad30ad (diff)
downloadtor-aa4be914f06baa92857de201a212b9fc9856bdb1.tar.gz
tor-aa4be914f06baa92857de201a212b9fc9856bdb1.zip
Merge remote-tracking branch 'teor/feature17327-v4'
Diffstat (limited to 'src/or/routerlist.h')
-rw-r--r--src/or/routerlist.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/routerlist.h b/src/or/routerlist.h
index 0ccd3f4dca..339e34ae03 100644
--- a/src/or/routerlist.h
+++ b/src/or/routerlist.h
@@ -171,10 +171,12 @@ int router_exit_policy_rejects_all(const routerinfo_t *router);
dir_server_t *trusted_dir_server_new(const char *nickname, const char *address,
uint16_t dir_port, uint16_t or_port,
+ const tor_addr_port_t *addrport_ipv6,
const char *digest, const char *v3_auth_digest,
dirinfo_type_t type, double weight);
dir_server_t *fallback_dir_server_new(const tor_addr_t *addr,
uint16_t dir_port, uint16_t or_port,
+ const tor_addr_port_t *addrport_ipv6,
const char *id_digest, double weight);
void dir_server_add(dir_server_t *ent);