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

[nickm at torproject.org]

commit 258759547b305a76b3985177698425d51b5d2d03
Merge: 40deb99c5 882b2ad0a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 7 08:05:56 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

 changes/bug27003               | 6 ++++++
 src/or/periodic.c              | 9 +++++----
 src/test/test_periodic_event.c | 8 ++------
 3 files changed, 13 insertions(+), 10 deletions(-)