Merge branch 'bug29670_035' into bug29670_041
commit4022b6d6b7a2b5e1260c4bccbad119e8461c0b84
authorNick Mathewson <nickm@torproject.org>
Tue, 4 Jun 2019 12:29:05 +0000 (4 08:29 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 4 Jun 2019 12:29:05 +0000 (4 08:29 -0400)
tree1d4c5b49b4e88b43eef25b8feaf1ef83d21e934b
parent180048e013c06ee67c053186aab46ff94cea0489
parent5cbd71b977f1c3ae0b9dc0f9e63094941ece015c
Merge branch 'bug29670_035' into bug29670_041
src/core/mainloop/connection.c