nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'arma/feature6760'

Browse Source
This commit is contained in:
Nick Mathewson 2012-09-04 10:14:55 -04:00
commit 978a2251f3
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/feature6760 Normal file
View File

@ -0,0 +1,6 @@
o Minor features:
- Don't log "I learned some more directory information" when we're
reading cached directory information. Reserve it for when new
directory information arrives in response to a fetch. Resolves
ticket 6760.

3
src/or/main.c
View File

@ -953,7 +953,8 @@ directory_info_has_arrived(time_t now, int from_cache)
const or_options_t *options = get_options();
if (!router_have_minimum_dir_info()) {
int quiet = directory_too_idle_to_fetch_descriptors(options, now);
int quiet = from_cache ||
directory_too_idle_to_fetch_descriptors(options, now);
log(quiet ? LOG_INFO : LOG_NOTICE, LD_DIR,
"I learned some more directory information, but not enough to "
"build a circuit: %s", get_dir_info_status_string());