diff options
author | teor <teor@torproject.org> | 2019-04-19 12:00:41 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2019-04-19 12:00:41 +1000 |
commit | 231036a110c1062e39b214b4b88fdc2a1eb46dc8 (patch) | |
tree | 9265e0873c59cb48d90d047b3a277bf81f4f3c00 /src/feature/relay | |
parent | 742b5b32d502712c7ad6d75adbf25fca6986c898 (diff) | |
parent | cbce8dedd3703424111928d68dfe8920900ce054 (diff) | |
download | tor-231036a110c1062e39b214b4b88fdc2a1eb46dc8.tar.gz tor-231036a110c1062e39b214b4b88fdc2a1eb46dc8.zip |
Merge branch 'maint-0.3.4' into maint-0.3.5
Diffstat (limited to 'src/feature/relay')
-rw-r--r-- | src/feature/relay/router.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index b376046c8d..dad2c6a50f 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2936,12 +2936,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. */ |