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

[asn at torproject.org]

commit a38014e5c6fa7955e9af61b42eddb2bc9edc29a9
Merge: 71767b06a fc32349ad
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Dec 10 18:34:00 2019 +0200

    Merge branch 'tor-github/pr/1581'

 changes/ticket32021         |  7 +++++++
 src/core/or/circuituse.c    | 13 ++++--------
 src/feature/hs/hs_circuit.c | 48 +++++++++++++++++++++++++++++++++++++++++++++
 src/feature/hs/hs_circuit.h |  2 ++
 4 files changed, 61 insertions(+), 9 deletions(-)