commit e188e02f28b3732c6788e4136685dcec4caa027d Merge: fd4fca378 8bc65cda4 Author: teor teor@torproject.org Date: Wed Oct 23 10:00:41 2019 +1000

Merge branch 'maint-0.4.1' into release-0.4.1

changes/ticket31549 | 4 +++ src/feature/dirauth/process_descs.c | 59 +++++++++++++++++++++++++++---------- 2 files changed, 47 insertions(+), 16 deletions(-)