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

[nickm at torproject.org]

commit 11eaf208c0aaa7c252ead6343ea65a3576227d69
Merge: 2ed4a3e61 a7ca71cf6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Nov 11 14:46:33 2017 -0500

    Merge branch 'bug24247_032'

 changes/bug24247               | 6 ++++++
 src/test/fuzz/fuzzing_common.c | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)