Merge branch 'tor-gitlab/mr/337'

diff --cc doc/man/tor.1.txt
Simple merge

diff --cc src/app/config/config.c
index f9f09dcd634550599e7d0dc0ff06d7e9e600d3b5,5b36554851831b57a234cd75da27f2f6218e20fe..e0eb0dac13a35504ffc77cd5a8f0c2cff0bc9061
--- 1/src/app/config/config.c
--- 2/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"),

diff --cc src/app/config/or_options_st.h
Simple merge

diff --cc src/core/mainloop/mainloop.c
Simple merge

diff --cc src/core/mainloop/netstatus.c
Simple merge

diff --cc src/test/test_mainloop.c
Simple merge