[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm at torproject.org]

commit 0e0baad5e82e6b06d63ba404ccd5cfb0afa61847
Merge: c30d2daae 7f2e23e7a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 19 16:30:53 2018 -0500

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug24895     |  8 ++++++++
 src/or/hs_common.c   | 17 +++++++++++++++++
 src/or/hs_common.h   |  1 +
 src/or/hs_service.c  |  1 +
 src/or/rendservice.c | 10 ++++++++--
 5 files changed, 35 insertions(+), 2 deletions(-)