[tor-commits] [tor/master] Merge branch 'tor-github/pr/1456'

[asn at torproject.org]

commit 4413b98190d94b543b85f57ac3c58f29d4bb96f1
Merge: 30705e829 b6c24eb48
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Oct 29 21:29:13 2019 +0800

    Merge branch 'tor-github/pr/1456'

 changes/ticket32094         |  4 ++++
 src/feature/hs/hs_circuit.c | 21 +++++++++++++++++++++
 src/feature/hs/hs_circuit.h |  2 ++
 src/feature/hs/hs_service.c | 17 ++---------------
 src/feature/hs/hs_service.h |  3 ---
 src/test/test_hs_service.c  |  8 --------
 6 files changed, 29 insertions(+), 26 deletions(-)