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

[asn at torproject.org]

commit 68a00c4951666b7658064f2547739d280f912398
Merge: 96a15bece 85b984dbc
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Nov 27 15:36:26 2019 +0200

    Merge branch 'tor-github/pr/1573'

 changes/ticket32020           |   6 +++
 src/core/or/circuitlist.c     |  41 +---------------
 src/core/or/circuituse.c      |  74 +++++++++++++++++++++-------
 src/core/or/circuituse.h      |   9 ++++
 src/feature/hs/hs_circuit.c   | 106 +++++++++++++++++++++++++++++++++-------
 src/feature/hs/hs_circuit.h   |   6 ++-
 src/feature/hs/hs_client.c    |  50 +++++++++++++++++++
 src/feature/hs/hs_client.h    |   3 ++
 src/feature/hs/hs_service.c   |  48 ++-----------------
 src/feature/hs/hs_service.h   |   2 -
 src/feature/rend/rendclient.c |  63 ++++++++++++++++++++++++
 src/feature/rend/rendclient.h |   3 ++
 src/test/test_hs_client.c     | 109 ++++++++++++++++++++++++++++++++++++++++++
 13 files changed, 398 insertions(+), 122 deletions(-)