commit b7f886beb43c098869742fbf55caef9bb8b702f2 Merge: a22bfe04bc f5ddc45647 Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 19 12:53:44 2021 -0500

Merge remote-tracking branch 'tor-gitlab/mr/163' into maint-0.4.3

changes/bug40113 | 3 +++ src/test/test_connection.c | 13 +++++++------ 2 files changed, 10 insertions(+), 6 deletions(-)