aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-04-19 11:44:38 +1000
committerteor <teor@torproject.org>2019-04-19 11:44:38 +1000
commitb1762f8d1254a89cd181ecf41db666d9bc75fa34 (patch)
treec082de2b95c80c6319570dcea22a1a21e52518a5 /src
parent8154b33f9c01bc8da652849805e4badf531bc4b1 (diff)
parent85c598cbc2d4ca1a7c729864002b5b222980ce19 (diff)
downloadtor-b1762f8d1254a89cd181ecf41db666d9bc75fa34.tar.gz
tor-b1762f8d1254a89cd181ecf41db666d9bc75fa34.zip
Merge remote-tracking branch 'tor-github/pr/638' into maint-0.3.4
Diffstat (limited to 'src')
-rw-r--r--src/or/router.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/or/router.c b/src/or/router.c
index 03959e907d..2f7d8349f9 100644
--- 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. */