commit 20d39e86afa37c2a7008c48f97c3ffd298441808 Merge: b46d126 d037369 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Apr 5 23:18:48 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18729 | 3 +++ src/or/periodic.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-)