summaryrefslogtreecommitdiff
path: root/src/or/routerlist.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-11-09 09:20:55 -0500
committerNick Mathewson <nickm@torproject.org>2017-11-09 09:20:55 -0500
commit552218437ccbe8fc13ad431fbe2167331b886497 (patch)
tree8a7f7f55cc0752d4499b4b7392ee8a0827b3a696 /src/or/routerlist.c
parent06260315645945ca9e08b5a19b67c8adad65a698 (diff)
parent0c6eabf08898e0c9f2faa397f2c2bb5fb80b78b9 (diff)
downloadtor-552218437ccbe8fc13ad431fbe2167331b886497.tar.gz
tor-552218437ccbe8fc13ad431fbe2167331b886497.zip
Merge branch 'ticket12062_squashed'
Diffstat (limited to 'src/or/routerlist.c')
-rw-r--r--src/or/routerlist.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index c74e4873c5..fb8225e0d6 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4545,7 +4545,7 @@ signed_desc_digest_is_recognized(signed_descriptor_t *desc)
void
update_all_descriptor_downloads(time_t now)
{
- if (get_options()->DisableNetwork)
+ if (should_delay_dir_fetches(get_options(), NULL))
return;
update_router_descriptor_downloads(now);
update_microdesc_downloads(now);