commit ab4395d08206d82f69512340cf5372d5121561ad Merge: 9190f43b1 bc836d559 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 21 13:26:47 2018 -0500

Merge branch 'ticket28847'

changes/ticket28847 | 3 +++ src/app/main/main.c | 5 ----- src/app/main/subsystem_list.c | 2 ++ src/lib/process/include.am | 2 ++ src/lib/process/process.h | 9 ++++++--- src/lib/process/process_sys.c | 33 +++++++++++++++++++++++++++++++++ src/lib/process/process_sys.h | 14 ++++++++++++++ src/lib/time/time_sys.h | 2 +- src/test/test_process.c | 27 --------------------------- src/test/test_process_slow.c | 8 -------- src/test/test_pt.c | 9 --------- 11 files changed, 61 insertions(+), 53 deletions(-)