[tor-commits] [tor/master] Merge branch 'tor-github/pr/1692'

[dgoulet at torproject.org]

commit f07d8a1a92b75d37cc0bd9eb42d45850b8f60e54
Merge: a1dec4472 f3ecf0b0a
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Jan 30 13:53:32 2020 -0500

    Merge branch 'tor-github/pr/1692'

 changes/ticket33091            |  3 +++
 src/core/mainloop/connection.c |  6 +++---
 src/core/mainloop/mainloop.c   | 30 +++++++++++++++++-------------
 src/core/mainloop/mainloop.h   |  2 +-
 4 files changed, 24 insertions(+), 17 deletions(-)