commit d4d5d9d1d1dec69aa51c0b8f5040599c95d7f6f0 Merge: caa392a73 0c18c94bb Author: Nick Mathewson <nickm@torproject.org> Date: Mon Feb 24 07:49:45 2020 -0500 Merge branch 'ticket33316_squashed' .gitignore | 2 ++ Makefile.am | 2 ++ changes/ticket33316 | 15 +++++++++++++++ src/app/main/subsystem_list.c | 18 +++++++----------- src/core/or/include.am | 2 -- src/core/or/ocirc_event.c | 11 ++--------- src/core/or/ocirc_event_sys.h | 13 ------------- src/core/or/or_sys.c | 12 ++++++++++++ src/core/or/or_sys.h | 4 ++++ src/core/or/orconn_event.c | 11 ++--------- src/core/or/orconn_event_sys.h | 12 ------------ src/feature/control/btrack.c | 2 +- src/include.am | 1 + src/lib/compress/compress.c | 2 +- src/lib/llharden/.may_include | 3 +++ src/lib/llharden/include.am | 19 +++++++++++++++++++ src/lib/llharden/lib_llharden.md | 6 ++++++ src/lib/{process => llharden}/winprocess_sys.c | 2 +- src/lib/{process => llharden}/winprocess_sys.h | 0 src/lib/net/network_sys.c | 2 +- src/lib/process/include.am | 6 ++---- src/lib/process/process_sys.c | 2 +- src/lib/thread/compat_threads.c | 4 +--- src/test/testing_common.c | 2 +- 24 files changed, 84 insertions(+), 69 deletions(-)