[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

[nickm at torproject.org]

commit 12175987fc744f5ca6559a821867631457911451
Merge: cec58ae55 d598d834f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 14 15:43:49 2018 -0500

    Merge branch 'maint-0.3.5'

 changes/bug27750             |  6 ++++++
 src/core/mainloop/mainloop.c | 17 ++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)