commit fca590a63f8950b910d4f6b3a4ff39a009e9bf32 Merge: 59072d202 00967cd2a Author: Nick Mathewson nickm@torproject.org Date: Mon Sep 11 16:13:55 2017 -0400

Merge branch 'ticket23304_032_01_squashed'

src/or/hs_client.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)