diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-02-19 13:58:53 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-02-19 13:58:53 -0500 |
| commit | a65efa7e8378fa470b7312509eecf92aa029817f (patch) | |
| tree | 6076babd9db8a440d70171e92a2ee5dae04399e3 /src/feature/client | |
| parent | 65b75ef3d5628fac8e8eeebaf66c437a505653e0 (diff) | |
| parent | defd941fe7f28264effffbbffb487ee4383ca2ba (diff) | |
| download | tor-a65efa7e8378fa470b7312509eecf92aa029817f.tar.gz tor-a65efa7e8378fa470b7312509eecf92aa029817f.zip | |
Merge branch 'extract_relay_dns'
Diffstat (limited to 'src/feature/client')
| -rw-r--r-- | src/feature/client/addressmap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/feature/client/addressmap.c b/src/feature/client/addressmap.c index 1a6958d38c..cc97166f36 100644 --- a/src/feature/client/addressmap.c +++ b/src/feature/client/addressmap.c @@ -23,7 +23,6 @@ #include "app/config/config.h" #include "core/or/connection_edge.h" #include "feature/control/control_events.h" -#include "feature/relay/dns.h" #include "feature/nodelist/nodelist.h" #include "feature/nodelist/routerset.h" @@ -689,7 +688,7 @@ client_dns_set_addressmap_impl(entry_connection_t *for_conn, if (ttl<0) ttl = DEFAULT_DNS_TTL; else - ttl = dns_clip_ttl(ttl); + ttl = clip_dns_ttl(ttl); if (exitname) { /* XXXX fails to ever get attempts to get an exit address of |