Merge branch 'tor-github/pr/638' into maint-0.4.0

This commit is contained in:
David Goulet
2019-02-26 11:24:43 -05:00
3 changed files with 10 additions and 7 deletions
+5 -6
View File
@@ -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. */