[tor-commits] [tor/master] Merge branch 'bug28348_035' into bug28348_036

[nickm at torproject.org]

commit c32dab9e4829391541b621a6b3a8700bf32a89a0
Merge: 674ef53a7 9431d3507
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 6 07:43:27 2018 -0500

    Merge branch 'bug28348_035' into bug28348_036

 changes/bug28348_034         | 5 +++++
 src/core/mainloop/mainloop.c | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)