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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.5' into release-0.3.5

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