commit 99809834a7aac5239b4b1bd7c74215d53856663b Merge: 1f60337da 841cff6e4 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 9 16:26:31 2019 -0400

Merge branch 'bug30344_squashed_035'

changes/bug30344 | 4 ++++ src/core/mainloop/connection.c | 18 ++++++++++++------ src/core/mainloop/mainloop.c | 10 ++++++++++ 3 files changed, 26 insertions(+), 6 deletions(-)