aboutsummaryrefslogtreecommitdiff
path: root/src/feature/relay
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2019-02-26 11:24:43 -0500
committerDavid Goulet <dgoulet@torproject.org>2019-02-26 11:24:43 -0500
commita5dd41b9afa744b0fdb77bad846366b751d031c2 (patch)
tree69066f828d38b0a56fdc1f9dee3b70643a049989 /src/feature/relay
parent4746e1261b403302852e3107a986e663d2b063c1 (diff)
parent85c598cbc2d4ca1a7c729864002b5b222980ce19 (diff)
downloadtor-a5dd41b9afa744b0fdb77bad846366b751d031c2.tar.gz
tor-a5dd41b9afa744b0fdb77bad846366b751d031c2.zip
Merge branch 'tor-github/pr/638' into maint-0.4.0
Diffstat (limited to 'src/feature/relay')
-rw-r--r--src/feature/relay/router.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c
index e796815409..cdd032f78d 100644
--- a/src/feature/relay/router.c
+++ b/src/feature/relay/router.c
@@ -3028,12 +3028,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. */