[tor-commits] [tor/master] Merge branch 'pr1838_squashed'

[teor at torproject.org]

commit 065ccda4f67023c752162227c77b0e1319e30b85
Merge: 00ce25a72 ea9ff5892
Author: teor <teor at torproject.org>
Date:   Tue Apr 7 17:36:17 2020 +1000

    Merge branch 'pr1838_squashed'

 changes/ticket31634                        |  4 ++
 doc/tor.1.txt                              |  7 +++
 scripts/maint/practracker/includes.py      | 90 +++++++++++++++++++++++++++++-
 scripts/maint/run_check_subsystem_order.sh | 17 ++++++
 src/app/config/config.c                    |  7 +++
 src/app/main/subsysmgr.c                   | 14 +++++
 src/app/main/subsysmgr.h                   |  2 +
 src/core/mainloop/mainloop_sys.c           |  1 +
 src/core/or/or_sys.c                       |  1 +
 src/feature/control/btrack.c               |  1 +
 src/feature/dirauth/dirauth_stub.c         |  1 +
 src/feature/dirauth/dirauth_sys.c          |  1 +
 src/feature/relay/relay_stub.c             |  1 +
 src/feature/relay/relay_sys.c              |  1 +
 src/lib/compress/compress.c                |  1 +
 src/lib/crypt_ops/crypto_init.c            |  1 +
 src/lib/err/torerr_sys.c                   |  1 +
 src/lib/evloop/evloop_sys.c                |  1 +
 src/lib/llharden/winprocess_sys.c          |  1 +
 src/lib/log/log_sys.c                      |  1 +
 src/lib/net/network_sys.c                  |  1 +
 src/lib/process/process_sys.c              |  1 +
 src/lib/subsys/subsys.h                    | 13 +++++
 src/lib/thread/compat_threads.c            |  1 +
 src/lib/time/time_sys.c                    |  1 +
 src/lib/tls/tortls.c                       |  1 +
 src/lib/wallclock/approx_time.c            |  1 +
 src/test/include.am                        |  4 +-
 28 files changed, 174 insertions(+), 3 deletions(-)