[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1

[dgoulet at torproject.org]

commit 7b60368ccf1bc16d61db1868eece73178ae28e65
Merge: 561134610 ff905f8e1
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Aug 29 08:55:58 2019 -0400

    Merge branch 'maint-0.4.1' into release-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(-)