commit e150e1af75a00e7b2dd9067f1ef533f67bb77c4c Merge: a9d66d37d 855cd533e Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 16 12:21:57 2020 -0400

Merge branch 'maint-0.4.3' into release-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(-)