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 'origin/maint-0.2.2'

Browse Source
This commit is contained in:
Nick Mathewson 2011-11-18 19:09:08 -05:00
commit 53dac6df18
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
changes/bug4353 Normal file
View File

@ -0,0 +1,7 @@
o Minor bugfixes:
- When running as client without a geoip database, do not print a
misleading (and plain wrong) log message that we're collecting
dirreq statistics - we're not collecting statistics as clients.
Also don't create a useless (because empty) stats file in the
stats/ directory. Fixes bug 4353, bugfix on 0.2.2.34.

9
src/or/config.c
View File

@ -1541,6 +1541,15 @@ options_act(const or_options_t *old_options)
options->BridgeAuthoritativeDir) { options->BridgeAuthoritativeDir) {
time_t now = time(NULL); time_t now = time(NULL);
int print_notice = 0; int print_notice = 0;
/* If we aren't acting as a server, we can't collect stats anyway. */
if (!server_mode(options)) {
options->CellStatistics = 0;
options->DirReqStatistics = 0;
options->EntryStatistics = 0;
options->ExitPortStatistics = 0;
}
if ((!old_options || !old_options->CellStatistics) && if ((!old_options || !old_options->CellStatistics) &&
options->CellStatistics) { options->CellStatistics) {
rep_hist_buffer_stats_init(now); rep_hist_buffer_stats_init(now);