commit 85688dc33ddc80233fa6c883a589fb4ba9377a5d Merge: e72dec18a 8c4119625 Author: Nick Mathewson nickm@torproject.org Date: Mon Sep 4 12:11:43 2017 -0400

Merge branch 'bug23360_032_01'

src/or/hs_service.c | 95 +++-------------------------------------------------- src/or/hs_service.h | 8 ----- src/or/nodelist.c | 2 +- 3 files changed, 6 insertions(+), 99 deletions(-)