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

This commit is contained in:
Nick Mathewson 2012-06-26 10:30:51 -04:00
commit 4050800251
2 changed files with 5 additions and 2 deletions

3
changes/bug6238 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes:
- Downgrade a message about cleaning the microdescriptor cache to
"info" from "notice". Fixes bug 6238; bugfix on 0.2.3.1-alpha.

View File

@ -373,7 +373,7 @@ microdesc_cache_clean(microdesc_cache_t *cache, time_t cutoff, int force)
} }
if (dropped) { if (dropped) {
log_notice(LD_DIR, "Removed %d/%d microdescriptors as old.", log_info(LD_DIR, "Removed %d/%d microdescriptors as old.",
dropped,dropped+kept); dropped,dropped+kept);
cache->bytes_dropped += bytes_dropped; cache->bytes_dropped += bytes_dropped;
} }