[tor-commits] [tor/master] Merge branch 'ticket_27861'

[nickm at torproject.org]

commit 09223ad83b09e75494863bacb3f8004c945ef015
Merge: de0b07c63 d0b2b5a20
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 27 16:24:47 2018 -0400

    Merge branch 'ticket_27861'

 changes/bug27861               |  4 ++++
 src/core/mainloop/mainloop.c   | 11 ++++++-----
 src/test/test_periodic_event.c |  8 ++++++--
 3 files changed, 16 insertions(+), 7 deletions(-)