diff options
| author | George Kadianakis <desnacked@riseup.net> | 2019-04-05 14:51:33 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2019-04-05 14:51:33 +0300 |
| commit | 574c20767059a9c39b33181a4792ac4aa7c71ba4 (patch) | |
| tree | 9c5f73f90256d4a70dba3991c795d9095f965792 /src/app | |
| parent | 1779878f9edbc915fa1cda8a132b321ca0fc55b3 (diff) | |
| parent | 747b74c1825de055bd027c9c74088efdd61d7481 (diff) | |
| download | tor-574c20767059a9c39b33181a4792ac4aa7c71ba4.tar.gz tor-574c20767059a9c39b33181a4792ac4aa7c71ba4.zip | |
Merge branch 'maint-0.4.0'
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/config/config.c | 1 | ||||
| -rw-r--r-- | src/app/config/or_options_st.h | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index 07521ea0ae..46dc15b069 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -398,6 +398,7 @@ static config_var_t option_vars_[] = { V(DormantClientTimeout, INTERVAL, "24 hours"), V(DormantTimeoutDisabledByIdleStreams, BOOL, "1"), V(DormantOnFirstStartup, BOOL, "0"), + V(DormantCanceledByStartup, BOOL, "0"), /* DoS circuit creation options. */ V(DoSCircuitCreationEnabled, AUTOBOOL, "auto"), V(DoSCircuitCreationMinConnections, UINT, "0"), diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index 06e11d3c75..bd707fd193 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -1092,6 +1092,11 @@ struct or_options_t { /** Boolean: true if Tor should be dormant the first time it starts with * a datadirectory; false otherwise. */ int DormantOnFirstStartup; + /** + * Boolean: true if Tor should treat every startup event as cancelling + * a possible previous dormant state. + **/ + int DormantCanceledByStartup; }; #endif |