diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-09 09:20:55 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-09 09:20:55 -0500 |
| commit | 552218437ccbe8fc13ad431fbe2167331b886497 (patch) | |
| tree | 8a7f7f55cc0752d4499b4b7392ee8a0827b3a696 /src/or/dns.c | |
| parent | 06260315645945ca9e08b5a19b67c8adad65a698 (diff) | |
| parent | 0c6eabf08898e0c9f2faa397f2c2bb5fb80b78b9 (diff) | |
| download | tor-552218437ccbe8fc13ad431fbe2167331b886497.tar.gz tor-552218437ccbe8fc13ad431fbe2167331b886497.zip | |
Merge branch 'ticket12062_squashed'
Diffstat (limited to 'src/or/dns.c')
| -rw-r--r-- | src/or/dns.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/dns.c b/src/or/dns.c index 4194a29a6b..c992c8c358 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -1665,7 +1665,7 @@ launch_resolve,(cached_resolve_t *resolve)) tor_addr_t a; int r; - if (get_options()->DisableNetwork) + if (net_is_disabled()) return -1; /* What? Nameservers not configured? Sounds like a bug. */ @@ -1900,7 +1900,7 @@ launch_test_addresses(evutil_socket_t fd, short event, void *args) (void)event; (void)args; - if (options->DisableNetwork) + if (net_is_disabled()) return; log_info(LD_EXIT, "Launching checks to see whether our nameservers like to " |