[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/247'

[asn at torproject.org]

commit a7ca08934341deab05d48fa0f074543116a29c38
Merge: 37ea6cd9eb 1811bded77
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Jan 27 15:39:29 2021 +0200

    Merge remote-tracking branch 'tor-gitlab/mr/247'

 changes/bug40207            | 4 ++++
 src/feature/hs/hs_circuit.c | 2 +-
 src/feature/hs/hs_client.c  | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)