commit 99713b176b3713c3960be7b2852ffdb301daa916 Merge: 70dd6d07b a9eec3364 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 21 15:42:58 2018 -0500

Merge branch 'maint-0.3.5'

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