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

[nickm at torproject.org]

commit 13455c0f1a191824d383339c9efcc3b31ecd8e6f
Merge: e622f208a cf5ab5934
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 12 09:32:29 2017 -0500

    Merge branch 'maint-0.3.2'

 src/or/hs_service.c | 50 +++++++++++++++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 17 deletions(-)