Merge remote-tracking branch 'tor-github/pr/745' into maint-0.4.0
commit3af943dcd19d5bdb8fba059e773b6795d4bf89f5
authorNick Mathewson <nickm@torproject.org>
Thu, 7 Mar 2019 13:56:35 +0000 (7 08:56 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 7 Mar 2019 13:56:35 +0000 (7 08:56 -0500)
tree592791aa040bae54e1835719afa9edbca628b663
parentd8409ccb76e1902e81f8f2c7d62babe64efd3e84
parent389ee834b6795ccabbe3d4c7edfdaf8d89696438
Merge remote-tracking branch 'tor-github/pr/745' into maint-0.4.0
src/core/mainloop/connection.c