Merge branch 'bug30344_squashed_035'
commit99809834a7aac5239b4b1bd7c74215d53856663b
authorNick Mathewson <nickm@torproject.org>
Wed, 9 Oct 2019 20:26:31 +0000 (9 16:26 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 9 Oct 2019 20:26:31 +0000 (9 16:26 -0400)
tree9a38685298e361141946bf41393d611bf3d3289b
parent1f60337da4bc1b813489482d9001285e9b104d3d
parent841cff6e4fe1cdd370cd51019e69c6c564e8059c
Merge branch 'bug30344_squashed_035'
src/core/mainloop/connection.c
src/core/mainloop/mainloop.c