commit b2f3b3b7ebf5b231f5dc7818ef8731e870ae1ed1 Merge: e1d8a4bd7 1749e0789 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 21 14:43:05 2017 -0400

Merge remote-tracking branch 'dgoulet/ticket23303_032_01'

src/or/hs_client.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)