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

[nickm at torproject.org]

commit 3900b1937973141b5c75f7221162375f7a2e1f9c
Merge: 7c06707750 d04a27bed2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 17 10:53:39 2020 -0500

    Merge branch 'maint-0.4.5' into master

 changes/ticket40195              | 5 +++++
 src/feature/relay/relay_config.c | 4 ++++
 2 files changed, 9 insertions(+)