commit aab5d90858beb7eb9738c237dab5bcb7dd6ce91f Merge: 37320bce0 8b4d7447a Author: Roger Dingledine <arma@torproject.org> Date: Sun Oct 20 05:56:16 2019 -0400 Merge branch 'maint-0.4.2' ChangeLog | 11 +++++------ ReleaseNotes | 2 +- src/feature/hibernate/hibernate.c | 6 +++--- src/feature/rend/rendservice.c | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-)