]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/745' into maint-0.4.0
authorNick Mathewson <nickm@torproject.org>
Thu, 7 Mar 2019 13:56:35 +0000 (08:56 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 7 Mar 2019 13:56:35 +0000 (08:56 -0500)
1  2 
src/core/mainloop/connection.c

Simple merge