commit a84fd949ed2deaf0f526569bc5e4c75270d35e41 Merge: c0fe88b23 b1e1c6b50 Author: teor teor@torproject.org Date: Sat Apr 4 13:23:56 2020 +1000

Merge branch 'maint-0.4.3'

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