commit 78ac7c751cf3051efe26f6c1e5fc7234bafe3942 Merge: 0c7725be8 e47273729 Author: David Goulet dgoulet@torproject.org Date: Thu Mar 26 09:15:00 2020 -0400

Merge branch 'maint-0.4.3' into release-0.4.3

changes/bug33608 | 5 +++++ src/core/mainloop/connection.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)