[tor-commits] [tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1256' into maint-0.3.5

[teor at torproject.org]

commit 003be727c4a88c04424cb13429cf36f887e92f5c
Merge: 1ea19d7a5 41bc1fac8
Author: teor <teor at torproject.org>
Date:   Wed Oct 23 08:28:03 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1256' into maint-0.3.5

 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(-)