diff options
author | Nick Mathewson <nickm@torproject.org> | 2012-05-16 11:14:00 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2012-05-16 11:14:00 -0400 |
commit | 517b9c602a9e5e8c60849892a426526e803ef412 (patch) | |
tree | 9f106f2722547333f28cea8d0072fd068be0ca0e /src/or/routerlist.c | |
parent | a925fc918975fd62581d438eec0dc8a1d53ce127 (diff) | |
parent | 5193752ca88849878a0843cec1e81c6b4b05e550 (diff) | |
download | tor-517b9c602a9e5e8c60849892a426526e803ef412.tar.gz tor-517b9c602a9e5e8c60849892a426526e803ef412.zip |
Merge remote-tracking branch 'public/bug2297'
Diffstat (limited to 'src/or/routerlist.c')
-rw-r--r-- | src/or/routerlist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index a32cae6e9b..0abc2e9bcf 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -229,7 +229,7 @@ trusted_dirs_load_certs_from_string(const char *contents, int from_store, "signing key %s", from_store ? "cached" : "downloaded", ds->nickname, hex_str(cert->signing_key_digest,DIGEST_LEN)); } else { - int adding = directory_caches_dir_info(get_options()); + int adding = directory_caches_unknown_auth_certs(get_options()); log_info(LD_DIR, "%s %s certificate for unrecognized directory " "authority with signing key %s", adding ? "Adding" : "Not adding", @@ -480,7 +480,7 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) smartlist_t *missing_digests; char *resource = NULL; cert_list_t *cl; - const int cache = directory_caches_dir_info(get_options()); + const int cache = directory_caches_unknown_auth_certs(get_options()); if (should_delay_dir_fetches(get_options())) return; |