[tor-commits] [tor/master] Set ConnDirectionStatistics back to 0 if not running as relay.

[nickm at torproject.org]

commit fda2aa7703b05074a4d5d433ac5e8411e695d897
Author: rl1987 <rl1987 at sdf.lonestar.org>
Date:   Mon Apr 6 20:09:34 2015 +0300

    Set ConnDirectionStatistics back to 0 if not running as relay.
---
 changes/bug15604 |    7 +++++++
 src/or/config.c  |    1 +
 2 files changed, 8 insertions(+)

diff --git a/changes/bug15604 b/changes/bug15604
new file mode 100644
index 0000000..de29380
--- /dev/null
+++ b/changes/bug15604
@@ -0,0 +1,7 @@
+  o Minor bugfixes
+    - Disregard the ConnDirectionStatistics torrc options when Tor is
+      not a relay since in that mode of operation no sensible data is
+      being collected and because Tor might run into measurement hiccups
+      when running as a client for some time, then becoming a relay. Fixes
+      bug 15604; bugfix on 0.2.2.35.
+
diff --git a/src/or/config.c b/src/or/config.c
index d65d35d..8319f7c 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1736,6 +1736,7 @@ options_act(const or_options_t *old_options)
     if (!public_server_mode(options)) {
       options->CellStatistics = 0;
       options->EntryStatistics = 0;
+      options->ConnDirectionStatistics = 0;
       options->HiddenServiceStatistics = 0;
       options->ExitPortStatistics = 0;
     }