[tor-commits] [tor/master] Merge branch 'tor-github/pr/993'
asn at torproject.org
asn at torproject.org
Tue Apr 30 16:18:52 UTC 2019
commit a44aca5453ca944369a9ab9b589499bed56c3599
Merge: 86f8dfe41 b7cc631d2
Author: George Kadianakis <desnacked at riseup.net>
Date: Tue Apr 30 19:13:57 2019 +0300
Merge branch 'tor-github/pr/993'
changes/ticket30293 | 5 +
scripts/maint/practracker/exceptions.txt | 6 +-
src/app/config/config.c | 1 +
src/app/main/shutdown.c | 3 -
src/app/main/subsystem_list.c | 9 ++
src/core/include.am | 6 +
src/core/mainloop/mainloop.c | 251 ++++---------------------------
src/core/mainloop/mainloop.h | 5 +-
src/core/mainloop/mainloop_sys.c | 32 ++++
src/core/mainloop/mainloop_sys.h | 12 ++
src/core/mainloop/periodic.c | 198 ++++++++++++++++++++++--
src/core/mainloop/periodic.h | 13 +-
src/feature/dirauth/dirauth_periodic.c | 142 +++++++++++++++++
src/feature/dirauth/dirauth_periodic.h | 25 +++
src/feature/dirauth/dirauth_sys.c | 33 ++++
src/feature/dirauth/dirauth_sys.h | 12 ++
src/feature/nodelist/networkstatus.c | 1 +
src/test/test_periodic_event.c | 39 ++---
18 files changed, 532 insertions(+), 261 deletions(-)
More information about the tor-commits
mailing list