commit 53dac6df1802bc68fb399a9bd3389f952740f56d Merge: b88db75 6ef44b7 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Nov 18 19:09:08 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4353 | 7 +++++++ src/or/config.c | 9 +++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --cc src/or/config.c index 1b9f9fb,ffa763e..afccf2e --- a/src/or/config.c +++ b/src/or/config.c @@@ -1536,11 -1411,18 +1536,20 @@@ options_act(const or_options_t *old_opt } if (options->CellStatistics || options->DirReqStatistics || - options->EntryStatistics || options->ExitPortStatistics) { + options->EntryStatistics || options->ExitPortStatistics || + options->ConnDirectionStatistics || + options->BridgeAuthoritativeDir) { time_t now = time(NULL); 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) && options->CellStatistics) { rep_hist_buffer_stats_init(now);