From: rl1987 <rl1987@sdf.lonestar.org>
Date: Mon, 6 Apr 2015 17:09:34 +0000 (+0300)
Subject: Set ConnDirectionStatistics back to 0 if not running as relay.
X-Git-Tag: tor-0.2.7.1-alpha~74^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fda2aa7703b05074a4d5d433ac5e8411e695d897;p=thirdparty%2Ftor.git

Set ConnDirectionStatistics back to 0 if not running as relay.
---

diff --git a/changes/bug15604 b/changes/bug15604
new file mode 100644
index 0000000000..de293800f1
--- /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 d65d35dfc2..8319f7ca01 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;
     }