commit 8ed4f1ee8418eaafcb6314f093d1186d711a837e Merge: 158db532e e847909b7 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Nov 2 09:04:25 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/ticket27410 | 5 +++++ src/or/hs_client.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)