commit 1cd6baad7ef543ec264790d4db3a3ff1d114d54e Merge: 742d18e047 9b390a556e Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 19 12:53:52 2021 -0500

Merge branch 'maint-0.4.3' into release-0.4.3

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