commit 6994a8d217c166a18437bbe9ce4a4be009438d07 Merge: ac64d19fed 83009f8003 Author: David Goulet <dgoulet@torproject.org> Date: Tue Jun 1 08:48:04 2021 -0400 Merge branch 'maint-0.4.6' src/feature/dirclient/dirclient.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)