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

[nickm at torproject.org]

commit 0227aab1b7084de271cfb7702cb3386bfb05a5bb
Merge: 02a4c641d 7d767706e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 6 13:01:56 2017 -0500

    Merge branch '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(-)