tor

commit b1762f8d1254a89cd181ecf41db666d9bc75fa34
parent 8154b33f9c01bc8da652849805e4badf531bc4b1
Author: teor <teor@torproject.org>
Date:   Fri, 19 Apr 2019 11:44:38 +1000

Merge remote-tracking branch 'tor-github/pr/638' into maint-0.3.4

Diffstat:
A
changes/bug29017
 | 
4
++++
M
doc/tor.1.txt
 | 
2
+-
M
src/or/router.c
 | 
11
+++++------

3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/changes/bug29017 b/changes/bug29017
@@ -0,0 +1,4 @@
+  o Minor bugfixes (stats):
+    - When ExtraInfoStatistics is 0, stop including PaddingStatistics in
+      relay and bridge extra-info documents. Fixes bug 29017;
+      bugfix on 0.3.1.1-alpha.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
@@ -2278,7 +2278,7 @@ is non-zero):
     extra-info document. (Default: 0)
 
 [[PaddingStatistics]] **PaddingStatistics** **0**|**1**::
-    Relays only.
+    Relays and bridges only.
     When this option is enabled, Tor collects statistics for padding cells
     sent and received by this relay, in addition to total cell counts.
     These statistics are rounded, and omitted if traffic is low. This
diff --git a/src/or/router.c b/src/or/router.c
@@ -3421,12 +3421,11 @@ extrainfo_dump_to_string(char **s_out, extrainfo_t *extrainfo,
                         "conn-bi-direct", now, &contents) > 0) {
       smartlist_add(chunks, contents);
     }
-  }
-
-  if (options->PaddingStatistics) {
-    contents = rep_hist_get_padding_count_lines();
-    if (contents)
-      smartlist_add(chunks, contents);
+    if (options->PaddingStatistics) {
+      contents = rep_hist_get_padding_count_lines();
+      if (contents)
+        smartlist_add(chunks, contents);
+    }
   }
 
   /* Add information about the pluggable transports we support. */