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

[asn at torproject.org]

commit 92a8573d22ce05636f9f1ad96cd1df7b8d809981
Merge: 0d7f76d7c 14654d5c9
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Aug 27 11:45:18 2019 +0300

    Merge branch 'tor-github/pr/1258'

 changes/bug31490            |  6 ++++++
 src/core/or/circuituse.c    |  3 +--
 src/feature/hs/hs_circuit.c |  6 ++----
 src/feature/hs/hs_ident.c   |  6 +-----
 src/feature/hs/hs_ident.h   | 10 +---------
 src/test/test_hs_client.c   |  9 +++------
 src/test/test_hs_service.c  |  9 +++------
 7 files changed, 17 insertions(+), 32 deletions(-)