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

[nickm at torproject.org]

commit 313b5b956c487dcdee21206c34c608835f699a73
Merge: 674ef53a7 9431d3507
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 6 09:16:25 2018 -0500

    Merge branch 'maint-0.3.5'

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