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

[nickm at torproject.org]

commit 39af9fc2b7ed60ed4007cf47a643e30b4c615aae
Merge: 62f98ad 491348c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 15 08:08:25 2017 -0500

    Merge branch 'bug21447'

 changes/bug21447         | 4 ++++
 doc/HACKING/Fuzzing.md   | 5 ++++-
 src/test/fuzz/include.am | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)