commit 825f52784d875ee580fe82619302a21c958d77ea Merge: b58e5091b d19f370aa Author: teor teor@torproject.org Date: Fri Nov 15 12:11:32 2019 +1000

Merge remote-tracking branch 'tor-github/pr/1535'

changes/ticket32244 | 3 +++ changes/ticket32245 | 3 +++ src/app/main/subsysmgr.c | 2 +- src/app/main/subsystem_list.c | 4 +++- src/core/include.am | 4 ++-- src/feature/dirauth/dirauth_sys.h | 4 ++++ src/feature/relay/relay_periodic.h | 13 +++++++++++++ src/feature/relay/relay_sys.h | 4 ++++ src/lib/conf/confdecl.h | 2 +- src/lib/crypt_ops/crypto_openssl_mgt.c | 2 +- 10 files changed, 35 insertions(+), 6 deletions(-)