diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-10-22 14:47:28 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-10-22 14:47:28 -0400 |
| commit | 1cdc030c3d3afbe16461271a1147397f87ba5693 (patch) | |
| tree | fb3823f048d95201006172c43405db7e15f7e39a /src/core | |
| parent | 91413e04b458f41334ea4e25e35829043956b742 (diff) | |
| parent | 2ed194c9a93c9e60ca4d4ff0bbf25acb2cf2c62c (diff) | |
| download | tor-1cdc030c3d3afbe16461271a1147397f87ba5693.tar.gz tor-1cdc030c3d3afbe16461271a1147397f87ba5693.zip | |
Merge branch 'maint-0.4.2'
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/mainloop/mainloop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index d58f263bdc..3327da55f1 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -1389,7 +1389,7 @@ STATIC periodic_event_item_t mainloop_periodic_events[] = { /* This is a legacy catch-all callback that runs once per second if * we are online and active. */ CALLBACK(second_elapsed, NET_PARTICIPANT, - FL(NEED_NET)|FL(RUN_ON_DISABLE)), + FL(RUN_ON_DISABLE)), /* XXXX Do we have a reason to do this on a callback? Does it do any good at * all? For now, if we're dormant, we can let our listeners decay. */ |