commit 3a47dfed349ee2c05f30ba142d3583772fa2287f Merge: cc74dc006 d6903e9e8 Author: Nick Mathewson nickm@torproject.org Date: Fri Apr 27 09:28:43 2018 -0400

Merge branch 'ticket25376_034_031_squashed'

changes/ticket25376_25762 | 10 ++++++ src/or/hibernate.c | 10 +++++- src/or/main.c | 78 +++++++++++++++++++++++++----------------- src/or/main.h | 1 + src/or/periodic.h | 15 ++++++-- src/test/test_periodic_event.c | 4 +++ 6 files changed, 84 insertions(+), 34 deletions(-)