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

commit 52e439c13eac6982a605c698c49629b1da48563d Merge: dd63b97288 afb6ff1739 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 9 16:13:24 2020 -0500

Merge remote-tracking branch 'tor-gitlab/mr/189' into maint-0.3.5

changes/bug40080 | 6 ++++++ src/core/or/channel.c | 2 +- src/core/or/channel.h | 3 +++ src/core/or/circuitbuild.c | 24 ++++++++++++++++++++---- 4 files changed, 30 insertions(+), 5 deletions(-)