commit e472737297f5924a584fc8f434aba085e89b887a Merge: 03b0d1840 cc2fb91ea Author: David Goulet dgoulet@torproject.org Date: Thu Mar 26 09:14:25 2020 -0400

Merge branch 'tor-github/pr/1794' into maint-0.4.3

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