Merge remote-tracking branch 'origin/maint-0.2.2'

This commit is contained in:
Nick Mathewson 2012-02-10 12:03:46 -05:00
commit 64523609c9
2 changed files with 8 additions and 3 deletions

5
changes/bug5067 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (usability):
- Downgrade the "We're missing a certificate" message from notice
to info: people kept mistaking it for a real problem, whereas it
is only a problem when we are failing to bootstrap. Fixes bug
5067; bugfix on 0.2.10-alpha.

View File

@ -510,7 +510,7 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now)
if (download_status_is_ready(&cl->dl_status, now, if (download_status_is_ready(&cl->dl_status, now,
MAX_CERT_DL_FAILURES) && MAX_CERT_DL_FAILURES) &&
!digestmap_get(pending, voter->identity_digest)) { !digestmap_get(pending, voter->identity_digest)) {
log_notice(LD_DIR, "We're missing a certificate from authority " log_info(LD_DIR, "We're missing a certificate from authority "
"with signing key %s: launching request.", "with signing key %s: launching request.",
hex_str(sig->signing_key_digest, DIGEST_LEN)); hex_str(sig->signing_key_digest, DIGEST_LEN));
smartlist_add(missing_digests, sig->identity_digest); smartlist_add(missing_digests, sig->identity_digest);