[tor-commits] [tor/master] Merge branch 'mr_175_squashed'

[nickm at torproject.org]

commit 579f200efc45e6c38e62e1104b3a869dc4beb3d8
Merge: 19302a1dfd 5248d08ede
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 20 09:03:26 2020 -0400

    Merge branch 'mr_175_squashed'

 changes/ticket40053               | 5 +++++
 src/feature/dirclient/dirclient.c | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)