]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug30344_squashed_035'
authorNick Mathewson <nickm@torproject.org>
Wed, 9 Oct 2019 20:26:31 +0000 (16:26 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 9 Oct 2019 20:26:31 +0000 (16:26 -0400)
1  2 
src/core/mainloop/connection.c
src/core/mainloop/mainloop.c

Simple merge
Simple merge