commit d7c35378d5a065617601619e3303bbeb02f27838 Merge: 7e6640453 02e3e8eda Author: teor <teor@torproject.org> Date: Sun Oct 20 22:08:56 2019 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 src/feature/hibernate/hibernate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)