commit ba28704b296b1036151e4bfa97e7091d7639a573 Merge: bb9044381 c60f3ea60 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Nov 6 15:22:11 2018 -0500 Merge branch 'maint-0.3.5' changes/ticket28113 | 5 +++++ contrib/dist/tor.service.in | 2 +- src/feature/hibernate/hibernate.c | 20 ++++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-)