]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1056' into maint-0.3.5
authorteor <teor@torproject.org>
Sun, 11 Aug 2019 23:51:35 +0000 (09:51 +1000)
committerteor <teor@torproject.org>
Sun, 11 Aug 2019 23:51:35 +0000 (09:51 +1000)
1  2 
src/core/mainloop/connection.c

Simple merge