[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

[nickm at torproject.org]

commit f4874765eabf15968b1af40992882bb4585d2b32
Merge: 1ef2ce9f2 a9eec3364
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 21 15:42:58 2018 -0500

    Merge branch 'maint-0.3.5' into release-0.3.5

 changes/ticket28912          |  6 ++++++
 src/core/mainloop/mainloop.c | 17 ++++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)