commit 8e3bae566aaa91d65cfcefef10ea8a4e3aeeb280 Merge: 2fb27d61e 212bd9778 Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 7 16:27:26 2018 -0500

Merge branch 'maint-0.3.5'

src/feature/hibernate/hibernate.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)