commit 3ca04aada2916ce6963358007476eccd851e67cc Merge: 3d7bf98d1 ad06e0b40 Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 15 20:23:23 2018 -0500

Merge remote-tracking branch 'valentecaio/t-25081'

changes/ticket25081 | 5 +++++ src/or/dirserv.c | 2 +- src/or/hibernate.c | 2 +- src/or/main.c | 19 +++++++++++++------ src/or/main.h | 2 +- src/or/router.c | 2 +- 6 files changed, 22 insertions(+), 10 deletions(-)