[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2

[arma at torproject.org]

commit 7e6640453881b9f51ebdcbdd4f4270add0004da8
Merge: 00ad6f12f 8b4d7447a
Author: Roger Dingledine <arma at torproject.org>
Date:   Sun Oct 20 05:55:46 2019 -0400

    Merge branch 'maint-0.4.2' into release-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(-)