]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.4.0'
authorteor <teor@torproject.org>
Wed, 10 Apr 2019 08:27:11 +0000 (18:27 +1000)
committerteor <teor@torproject.org>
Wed, 10 Apr 2019 08:27:11 +0000 (18:27 +1000)
1  2 
src/core/mainloop/connection.c

Simple merge