commit e847909b71333690d3fb9a31a738ea3c1ab6d1e1 Merge: bcc1a7180 fa6d5dd26 Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 2 09:04:20 2018 -0400

Merge remote-tracking branch 'dgoulet/ticket27410_032_01' into maint-0.3.3

changes/ticket27410 | 5 +++++ src/or/hs_client.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)