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

[asn at torproject.org]

commit 07f2a06c6190696cf47b8e42476bb70b11083f15
Merge: f43fe890dd 05242f5555
Author: George Kadianakis <desnacked at riseup.net>
Date:   Mon Oct 26 17:04:58 2020 +0200

    Merge remote-tracking branch 'tor-gitlab/mr/169' into master

 changes/bug33124              | 4 ++++
 src/core/or/circuituse.c      | 3 ++-
 src/core/or/connection_edge.c | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)