diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-08 13:55:02 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-08 13:55:02 -0400 |
| commit | 245f273aaf6a6189a57d837d5fd76b76cc9b6f8e (patch) | |
| tree | 2806ce750222a7e80e6151656360aeeb0a6d93eb /src/or/router.h | |
| parent | 3ac426afe8f169cb2c16de9d37b8630b7c3216f5 (diff) | |
| parent | 51e13cd1ad5f7c130521e2a964ea462f35d1880e (diff) | |
| download | tor-245f273aaf6a6189a57d837d5fd76b76cc9b6f8e.tar.gz tor-245f273aaf6a6189a57d837d5fd76b76cc9b6f8e.zip | |
Merge branch 'bug7952_final'
Conflicts:
src/test/include.am
src/test/test.c
Diffstat (limited to 'src/or/router.h')
| -rw-r--r-- | src/or/router.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/router.h b/src/or/router.h index bf6cdbea33..28e1ed6e6b 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -94,6 +94,9 @@ int router_pick_published_address(const or_options_t *options, uint32_t *addr); int router_rebuild_descriptor(int force); char *router_dump_router_to_string(routerinfo_t *router, crypto_pk_t *ident_key); +char *router_dump_exit_policy_to_string(const routerinfo_t *router, + int include_ipv4, + int include_ipv6); void router_get_prim_orport(const routerinfo_t *router, tor_addr_port_t *addr_port_out); void router_get_pref_orport(const routerinfo_t *router, |