commit dd5ca2505599dee6a589e228b69c4e8d4f29d7e6 Merge: 706e6893d cf5ab5934 Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 12 09:32:29 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

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