commit b7304027f661ae9abb1f306ac60aaaa3296d8a21 Merge: 08bfc2d71 a8b5b9a1b Author: George Kadianakis desnacked@riseup.net Date: Wed Dec 18 14:19:15 2019 +0200

Merge branch 'tor-github/pr/1587'

changes/bug32639 | 4 ++++ src/feature/hs/hs_client.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)