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

[nickm at torproject.org]

commit 882b2ad0aa46702e8420ef0d4bd788daff6f3ffd
Merge: a54e94878 176999fd9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 7 08:05:51 2018 -0400

    Merge branch 'bug27003_034_v2' into maint-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(-)