diff options
| -rw-r--r-- | src/or/config.c | 1 | ||||
| -rw-r--r-- | src/or/or.h | 4 | ||||
| -rw-r--r-- | src/or/routerlist.c | 6 |
3 files changed, 3 insertions, 8 deletions
diff --git a/src/or/config.c b/src/or/config.c index 302e0a7596..f83ca0f246 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -211,7 +211,6 @@ static config_var_t _option_vars[] = { V(HttpsProxyAuthenticator, STRING, NULL), OBSOLETE("IgnoreVersion"), V(KeepalivePeriod, INTERVAL, "5 minutes"), - V(LearnAuthorityAddrFromCerts, BOOL, "1"), VAR("Log", LINELIST, Logs, NULL), OBSOLETE("LinkPadding"), OBSOLETE("LogLevel"), diff --git a/src/or/or.h b/src/or/or.h index 34a7c26d86..4625f7852c 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2318,10 +2318,6 @@ typedef struct { char *FallbackNetworkstatusFile; /** DOCDOC here and in tor.1 */ - /**XXXX020 make this always on? */ - int LearnAuthorityAddrFromCerts; - - /** DOCDOC here and in tor.1 */ int BridgeRecordUsageByCountry; char *GeoIPFile; diff --git a/src/or/routerlist.c b/src/or/routerlist.c index e66f8c0b12..f512659cd2 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -109,7 +109,6 @@ trusted_dirs_load_certs_from_string(const char *contents, int from_store) { trusted_dir_server_t *ds; const char *s, *eos; - or_options_t *options = get_options(); for (s = contents; *s; s = eos) { authority_cert_t *cert = authority_cert_parse_from_string(s, &eos); @@ -151,8 +150,9 @@ trusted_dirs_load_certs_from_string(const char *contents, int from_store) ds->nickname, hex_str(cert->signing_key_digest,DIGEST_LEN)); smartlist_add(ds->v3_certs, cert); - if (options->LearnAuthorityAddrFromCerts && - cert->cache_info.published_on > ds->addr_current_at) { + if (cert->cache_info.published_on > ds->addr_current_at) { + /* Check to see whether we should update our view of the authority's + * address. */ if (cert->addr && cert->dir_port && (ds->addr != cert->addr || ds->dir_port != cert->dir_port)) { |