commit 15a95df376f8b8e27072db8d36f28b7054d13cef
Merge: 0ac03390e4 066748c9cd
Author: David Goulet <dgoulet(a)torproject.org>
Date: Wed Mar 17 11:53:14 2021 -0400
Merge branch 'tor-gitlab/mr/337'
changes/ticket40228 | 4 ++++
doc/man/tor.1.txt | 6 ++++++
src/app/config/config.c | 5 +++--
src/app/config/or_options_st.h | 7 +++++++
src/core/mainloop/mainloop.c | 6 ++++++
src/core/mainloop/netstatus.c | 3 +++
src/test/test_mainloop.c | 2 ++
7 files changed, 31 insertions(+), 2 deletions(-)
diff --cc src/app/config/config.c
index f9f09dcd63,5b36554851..e0eb0dac13
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@@ -422,10 -424,24 +422,11 @@@ static const config_var_t option_vars_[
OBSOLETE("DynamicDHGroups"),
VPORT(DNSPort),
OBSOLETE("DNSListenAddress"),
- V(DormantClientTimeout, INTERVAL, "24 hours"),
- V(DormantTimeoutDisabledByIdleStreams, BOOL, "1"),
+ V(DormantClientTimeout, INTERVAL, "24 hours"),
+ V(DormantTimeoutEnabled, BOOL, "1"),
+ V(DormantTimeoutDisabledByIdleStreams, BOOL, "1"),
V(DormantOnFirstStartup, BOOL, "0"),
V(DormantCanceledByStartup, BOOL, "0"),
- /* DoS circuit creation options. */
- V(DoSCircuitCreationEnabled, AUTOBOOL, "auto"),
- V(DoSCircuitCreationMinConnections, POSINT, "0"),
- V(DoSCircuitCreationRate, POSINT, "0"),
- V(DoSCircuitCreationBurst, POSINT, "0"),
- V(DoSCircuitCreationDefenseType, INT, "0"),
- V(DoSCircuitCreationDefenseTimePeriod, INTERVAL, "0"),
- /* DoS connection options. */
- V(DoSConnectionEnabled, AUTOBOOL, "auto"),
- V(DoSConnectionMaxConcurrentCount, POSINT, "0"),
- V(DoSConnectionDefenseType, INT, "0"),
- /* DoS single hop client options. */
- V(DoSRefuseSingleHopClientRendezvous, AUTOBOOL, "auto"),
V(DownloadExtraInfo, BOOL, "0"),
V(TestingEnableConnBwEvent, BOOL, "0"),
V(TestingEnableCellStatsEvent, BOOL, "0"),