[tor-commits] [tor/master] Merge branch 'bug24150_032_squashed' into maint-0.3.2

[nickm at torproject.org]

commit 7d767706ef9d46738028ed3990d638283929fd85
Merge: bebdd9105 5240afa71
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 6 12:59:23 2017 -0500

    Merge branch 'bug24150_032_squashed' into maint-0.3.2

 changes/bug24150              |  4 ++++
 src/or/hs_descriptor.c        | 11 ++++++++++-
 src/test/fuzz/fuzz_hsdescv3.c |  8 +++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)