diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-03-10 14:08:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-03-10 14:08:38 -0400 |
| commit | b8ceb464e5949b07ba9bd007002a49f3ab9c600b (patch) | |
| tree | bda3db474b49de8a9c091bdd8cbac786a6eb5e67 /src/or/routerlist.c | |
| parent | 0c04416c11d79e8dc5fc9def6ea337f75526e397 (diff) | |
| parent | 6606e676eeafd8ff848dfb247e2b675eed190698 (diff) | |
| download | tor-b8ceb464e5949b07ba9bd007002a49f3ab9c600b.tar.gz tor-b8ceb464e5949b07ba9bd007002a49f3ab9c600b.zip | |
Merge branch 'bug11156_squashed'
Diffstat (limited to 'src/or/routerlist.c')
| -rw-r--r-- | src/or/routerlist.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 49ea752bad..8d29b89ea9 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -669,7 +669,7 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) char id_digest_str[2*DIGEST_LEN+1]; char sk_digest_str[2*DIGEST_LEN+1]; - if (should_delay_dir_fetches(get_options())) + if (should_delay_dir_fetches(get_options(), NULL)) return; pending_cert = fp_pair_map_new(); @@ -4592,7 +4592,7 @@ void update_router_descriptor_downloads(time_t now) { const or_options_t *options = get_options(); - if (should_delay_dir_fetches(options)) + if (should_delay_dir_fetches(options, NULL)) return; if (!we_fetch_router_descriptors(options)) return; @@ -4613,7 +4613,7 @@ update_extrainfo_downloads(time_t now) int n_no_ei = 0, n_pending = 0, n_have = 0, n_delay = 0; if (! options->DownloadExtraInfo) return; - if (should_delay_dir_fetches(options)) + if (should_delay_dir_fetches(options, NULL)) return; if (!router_have_minimum_dir_info()) return; |