commit cf58b0b369605168c0c72994d600147fa477a5b1 Merge: b2cda3269 e47273729 Author: David Goulet dgoulet@torproject.org Date: Thu Mar 26 09:15:01 2020 -0400

Merge branch 'maint-0.4.3'

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