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

[nickm at torproject.org]

commit 4973ceb46b2b969906a4574d5aa608512c5bf83d
Merge: 39bd10dca 55b4f02ba
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 1 09:11:20 2019 -0400

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

 changes/ticket30078              | 3 +++
 src/test/fuzz/fixup_filenames.sh | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)