From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 19 Nov 2011 00:09:08 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.8-alpha~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=53dac6df1802bc68fb399a9bd3389f952740f56d;p=thirdparty%2Ftor.git

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

53dac6df1802bc68fb399a9bd3389f952740f56d
diff --cc src/or/config.c
index 1b9f9fb475,ffa763e65c..afccf2e84e
--- 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);