Merge branch 'bug15604_squashed'

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.
+

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;
     }