From: David Goulet Date: Wed, 17 Mar 2021 15:53:14 +0000 (-0400) Subject: Merge branch 'tor-gitlab/mr/337' X-Git-Tag: tor-0.4.6.1-alpha~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15a95df376f8b8e27072db8d36f28b7054d13cef;p=thirdparty%2Ftor.git Merge branch 'tor-gitlab/mr/337' --- 15a95df376f8b8e27072db8d36f28b7054d13cef 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"),