Merge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.3.5
commitad7ffa5240c4b3a9b675a12f0705d9cbe0bc8beb
authorNick Mathewson <nickm@torproject.org>
Wed, 7 Oct 2020 12:25:55 +0000 (7 08:25 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 7 Oct 2020 12:25:55 +0000 (7 08:25 -0400)
treeb3ca342876222d4a8238d5c8bb645af1b305e958
parent98e14720b5bc30a7cf9af15a1f618ddce0922ef9
parentceb6585a4bc2beadde2fb194395711e72ee8559d
Merge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.3.5
src/core/mainloop/connection.c