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/core/mainloop | |
| parent | 1779878f9edbc915fa1cda8a132b321ca0fc55b3 (diff) | |
| parent | 747b74c1825de055bd027c9c74088efdd61d7481 (diff) | |
| download | tor-574c20767059a9c39b33181a4792ac4aa7c71ba4.tar.gz tor-574c20767059a9c39b33181a4792ac4aa7c71ba4.zip | |
Merge branch 'maint-0.4.0'
Diffstat (limited to 'src/core/mainloop')
| -rw-r--r-- | src/core/mainloop/netstatus.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/mainloop/netstatus.c b/src/core/mainloop/netstatus.c index fc5a465ff7..4924888598 100644 --- a/src/core/mainloop/netstatus.c +++ b/src/core/mainloop/netstatus.c @@ -144,6 +144,10 @@ netstatus_load_from_state(const or_state_t *state, time_t now) last_activity = now - 60 * state->MinutesSinceUserActivity; participating_on_network = true; } + if (get_options()->DormantCanceledByStartup) { + last_activity = now; + participating_on_network = true; + } reset_user_activity(last_activity); } |