mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-24 04:13:28 +01:00
Merge branch 'bug29017-033' into bug29017-master-merge
This commit is contained in:
commit
361738c964
4
changes/bug29017
Normal file
4
changes/bug29017
Normal file
@ -0,0 +1,4 @@
|
||||
o Minor bugfixes (stats):
|
||||
- When ExtraInfoStatistics is 0, stop including PaddingStatistics in
|
||||
relay and bridge extra-info documents. Fixes bug 29017;
|
||||
bugfix on 0.3.1.1-alpha.
|
@ -2340,7 +2340,7 @@ is non-zero):
|
||||
extra-info document. (Default: 0)
|
||||
|
||||
[[PaddingStatistics]] **PaddingStatistics** **0**|**1**::
|
||||
Relays only.
|
||||
Relays and bridges only.
|
||||
When this option is enabled, Tor collects statistics for padding cells
|
||||
sent and received by this relay, in addition to total cell counts.
|
||||
These statistics are rounded, and omitted if traffic is low. This
|
||||
|
@ -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. */
|
||||
|
Loading…
Reference in New Issue
Block a user