diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-22 14:17:11 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-22 14:17:11 -0500 |
| commit | 2eadbd41f0d0356898c75d7fab032109a85bc9e9 (patch) | |
| tree | 0ac59d0ac72ba70cef13438744568355405a461a /src/or/config.c | |
| parent | b7f201f74606aff1f77551449bebe8783a59733a (diff) | |
| parent | 7736f44698798111be413ca3285a77ce1e4d6b0c (diff) | |
| download | tor-2eadbd41f0d0356898c75d7fab032109a85bc9e9.tar.gz tor-2eadbd41f0d0356898c75d7fab032109a85bc9e9.zip | |
Merge remote branch 'sebastian/bug2496'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/or/config.c b/src/or/config.c index 97a2b32451..aa4d9743b2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1390,10 +1390,12 @@ options_act(or_options_t *old_options) print_notice = 1; } else { options->DirReqStatistics = 0; - log_notice(LD_CONFIG, "Configured to measure directory request " - "statistics, but no GeoIP database found! " - "Please specify a GeoIP database using the " - "GeoIPFile option!"); + /* Don't warn Tor clients, they don't use statistics */ + if (options->ORPort) + log_notice(LD_CONFIG, "Configured to measure directory request " + "statistics, but no GeoIP database found. " + "Please specify a GeoIP database using the " + "GeoIPFile option."); } } if ((!old_options || !old_options->EntryStatistics) && @@ -1404,9 +1406,9 @@ options_act(or_options_t *old_options) } else { options->EntryStatistics = 0; log_notice(LD_CONFIG, "Configured to measure entry node " - "statistics, but no GeoIP database found! " + "statistics, but no GeoIP database found. " "Please specify a GeoIP database using the " - "GeoIPFile option!"); + "GeoIPFile option."); } } if ((!old_options || !old_options->ExitPortStatistics) && |