commit b27c029266b3d72011b58cea2795a65613a422f6 Merge: e8c584176 b1cb16867 Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 28 10:05:21 2017 -0400

Merge remote-tracking branch 'asn/bug23335'

src/or/directory.h | 1 - src/or/hs_service.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-)