[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/167'

[nickm at torproject.org]

commit 151d446aa1df2ab67584f4aa7c04be234f18fc91
Merge: bb249a221f 29065db381
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 19 11:15:20 2020 -0400

    Merge remote-tracking branch 'tor-gitlab/mr/167'

 changes/ticket40159               |  2 ++
 src/feature/dirclient/dirclient.c | 23 ++++++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)