commit 452398913a11e9bf21d6a0ef0a8d8eac054cc636 Merge: 9ef8f5d1b 460b97380 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 16 10:40:55 2020 -0400

Merge branch 'ticket32672_041_squashed' into ticket32672_042_squashed_w_test

changes/ticket32672 | 4 ++++ src/feature/dirauth/process_descs.c | 21 ++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-)