summaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2021-03-17 18:23:18 +0200
committerGeorge Kadianakis <desnacked@riseup.net>2021-03-17 18:23:18 +0200
commit29f07a4e9d2e7cd061e696f673c42e00885ec231 (patch)
tree5db514a485f8b35a32fa1ed05a974e970fd37b7e /src/app
parent15a95df376f8b8e27072db8d36f28b7054d13cef (diff)
parent7740a8b5d4de649e3ba2a0578f789140725974b6 (diff)
downloadtor-29f07a4e9d2e7cd061e696f673c42e00885ec231.tar.gz
tor-29f07a4e9d2e7cd061e696f673c42e00885ec231.zip
Merge branch 'mr/334'
Diffstat (limited to 'src/app')
-rw-r--r--src/app/config/config.c1
-rw-r--r--src/app/config/or_options_st.h3
2 files changed, 4 insertions, 0 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c
index e0eb0dac13..b6ad1e0808 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -352,6 +352,7 @@ static const config_var_t option_vars_[] = {
V(CacheDirectoryGroupReadable, AUTOBOOL, "auto"),
V(CellStatistics, BOOL, "0"),
V(PaddingStatistics, BOOL, "1"),
+ V(OverloadStatistics, BOOL, "1"),
V(LearnCircuitBuildTimeout, BOOL, "1"),
V(CircuitBuildTimeout, INTERVAL, "0"),
OBSOLETE("CircuitIdleTimeout"),
diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h
index 641d276ff3..510ece42a3 100644
--- a/src/app/config/or_options_st.h
+++ b/src/app/config/or_options_st.h
@@ -674,6 +674,9 @@ struct or_options_t {
/** If true, include statistics file contents in extra-info documents. */
int ExtraInfoStatistics;
+ /** If true, include overload statistics in extra-info documents. */
+ int OverloadStatistics;
+
/** If true, do not believe anybody who tells us that a domain resolves
* to an internal address, or that an internal address has a PTR mapping.
* Helps avoid some cross-site attacks. */