commit 62ca07b1fd8d9e3dacf6d82610e6318f4705a820 Merge: adf81fb757 ec0f000445 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 9 16:17:50 2020 -0500

Merge branch 'maint-0.4.4' into release-0.4.4

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(-)