Merge branch 'netflow_padding-v6-rebased2-squashed'

1 files changed, 6 insertions, 0 deletions

diff --git a/src/or/router.c b/src/or/router.c
index 2336a5d3df..6318f78549 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -3295,6 +3295,12 @@ extrainfo_dump_to_string(char **s_out, extrainfo_t *extrainfo,
     }
   }
 
+  if (options->PaddingStatistics) {
+    contents = rep_hist_get_padding_count_lines();
+    if (contents)
+      smartlist_add(chunks, contents);
+  }
+
   /* Add information about the pluggable transports we support. */
   if (options->ServerTransportPlugin) {
     char *pluggable_transports = pt_get_extra_info_descriptor_string();