commit d4724f1414d23cda7ae9a27f45cef9faf7e89544 Merge: 016246366 212bd9778 Author: Nick Mathewson <nickm at torproject.org> Date: Wed Nov 7 16:27:26 2018 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 src/feature/hibernate/hibernate.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)