commit 2b2e53b7fb5dc68ba4fa5d3b14fc5ca0a78648a2 Merge: 628a44424 b1e1c6b50 Author: teor teor@torproject.org Date: Sat Apr 4 13:23:52 2020 +1000

Merge branch 'maint-0.4.3' into release-0.4.3

changes/bug33782 | 7 +++++++ src/test/test_connection.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)