commit 1ace56149546e7f99a205b14e5086f8924102ae5 Merge: e160fc57f 8ed4f1ee8 Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 2 09:04:25 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

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