diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-06-28 10:48:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-06-28 10:48:06 -0400 |
| commit | d4a64fdc02e7aa6dc30dcb3cf15f3d6cf9e74f20 (patch) | |
| tree | 1b43df13cca564370de96bbe04d2281f030e2370 | |
| parent | 5a73df02176fb4c6ccd6a627c2cd14c5cfe4d9f8 (diff) | |
| parent | dc9dd2324b848643908082442207469c50a46f43 (diff) | |
| download | tor-d4a64fdc02e7aa6dc30dcb3cf15f3d6cf9e74f20.tar.gz tor-d4a64fdc02e7aa6dc30dcb3cf15f3d6cf9e74f20.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3'
| -rw-r--r-- | changes/bug5238 | 4 | ||||
| -rw-r--r-- | src/or/routerlist.c | 15 |
2 files changed, 16 insertions, 3 deletions
diff --git a/changes/bug5238 b/changes/bug5238 new file mode 100644 index 0000000000..866f796377 --- /dev/null +++ b/changes/bug5238 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Downgrade "Got a certificate, but we already have it" log mesages from + warning to info, except when we're a dirauth. Fixes bug #5238; bugfix + on 0.2.1.7-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 490c123367..8349b7ad6c 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -217,9 +217,18 @@ trusted_dirs_load_certs_from_string(const char *contents, int from_store, * probably means we wanted a different secret key or we are trying to * replace an expired cert that has not in fact been updated. */ if (!from_store) { - log_warn(LD_DIR, "Got a certificate for %s, but we already have it. " - "Maybe they haven't updated it. Waiting for a while.", - ds ? ds->nickname : "an old or new authority"); + if (authdir_mode(get_options())) { + log_warn(LD_DIR, + "Got a certificate for %s, but we already have it. " + "Maybe they haven't updated it. Waiting for a while.", + ds ? ds->nickname : "an old or new authority"); + } else { + log_info(LD_DIR, + "Got a certificate for %s, but we already have it. " + "Maybe they haven't updated it. Waiting for a while.", + ds ? ds->nickname : "an old or new authority"); + } + authority_cert_dl_failed(cert->cache_info.identity_digest, 404); } |