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

[dgoulet at torproject.org]

commit 1aa8fd66be0c1db3339b6b1fd6653981da9fbd75
Merge: 41ad333c2f 218f9f90fb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 13 09:40:02 2021 -0400

    Merge branch 'maint-0.4.5' into release-0.4.5

 changes/ticket40360             | 5 +++++
 src/feature/client/entrynodes.c | 3 ---
 2 files changed, 5 insertions(+), 3 deletions(-)