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

[nickm at torproject.org]

commit 6320b2988c59afb69c80ee0855579960e40a77d8
Merge: 0cbe0f9ca db52180ab
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 24 17:06:56 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/942'

 changes/ticket30077         | 2 ++
 src/test/fuzz/fuzz_multi.sh | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)