[tor-commits] [tor/release-0.4.4] Merge remote-tracking branch 'tor-gitlab/mr/130' into maint-0.4.4

[asn at torproject.org]

commit 1397a86bbda04fbcf3e902282ccb4dd689821ea1
Merge: 6e37086f85 f5c9f6d432
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Aug 25 14:51:05 2020 +0300

    Merge remote-tracking branch 'tor-gitlab/mr/130' into maint-0.4.4

 changes/ticket40109            | 6 ++++++
 src/core/or/or_circuit_st.h    | 4 ++++
 src/feature/hs/hs_dos.c        | 5 +++++
 src/feature/hs/hs_intropoint.c | 5 +++++
 4 files changed, 20 insertions(+)