[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1938/head'

[nickm at torproject.org]

commit ac3bc88343c0cb517eae59660c16f3a6cb273f44
Merge: 00f921edb 7cf031a0c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 6 09:34:13 2020 -0400

    Merge remote-tracking branch 'tor-github/pr/1938/head'

 changes/bug34357                    | 4 ++++
 src/feature/dirauth/process_descs.c | 8 ++++----
 src/test/test_process_descs.c       | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)