aboutsummaryrefslogtreecommitdiff
path: root/src/feature/relay
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-02-19 18:59:16 +1000
committerteor <teor@torproject.org>2019-02-19 18:59:16 +1000
commit361738c9649d20f0e759abed478253482836e294 (patch)
tree742c68efc666b91b0a44949986b39787f75e2d57 /src/feature/relay
parent94f7e53d0416d80bacc5e2cf86e97ab07cfb09f2 (diff)
parent85c598cbc2d4ca1a7c729864002b5b222980ce19 (diff)
downloadtor-361738c9649d20f0e759abed478253482836e294.tar.gz
tor-361738c9649d20f0e759abed478253482836e294.zip
Merge branch 'bug29017-033' into bug29017-master-merge
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. */