commit 855cd533e17f4dc4cd055fa8bb31ee3b187451dc Merge: 93d12baf8 612c40bc3 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 16 12:21:49 2020 -0400 Merge branch 'ticket32672_042_squashed_w_test' into maint-0.4.3 changes/ticket32672 | 4 ++++ src/feature/dirauth/process_descs.c | 21 ++++++++++----------- src/test/test_process_descs.c | 17 ++++++++++------- 3 files changed, 24 insertions(+), 18 deletions(-)