commit 9cd20e82763af43424085cf651dd4b08e69967e1 Merge: 884ccd6996 6de860497e Author: David Goulet <dgoulet@torproject.org> Date: Thu Jul 23 07:16:05 2020 -0400 Merge branch 'tor-gitlab/mr/75' src/feature/dirclient/dirclient.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)