commit 8bc65cda4423d27896dcf3060cbe4d6abcdd3438 Merge: 4a5c909ce f3c0a0b9f Author: teor teor@torproject.org Date: Wed Oct 23 09:58:22 2019 +1000

Merge branch 'pr1450_squashed' into maint-0.4.1

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