commit 7c99a4dddee8350a4997ed2e2033dc9c20242da1 Merge: 04ab357df ff905f8e1 Author: David Goulet dgoulet@torproject.org Date: Thu Aug 29 08:55:58 2019 -0400

Merge branch 'maint-0.4.1'

changes/bug23507 | 5 +++++ changes/bug23818_v2 | 6 ++++++ changes/bug23818_v3 | 6 ++++++ src/feature/hs/hs_circuit.c | 28 ++++++++++++++++++++++------ src/feature/hs/hs_circuit.h | 3 ++- src/feature/hs/hs_service.c | 30 +++++++++++++++++++++++------- src/feature/rend/rendservice.c | 19 +++++++++++++++---- 7 files changed, 79 insertions(+), 18 deletions(-)