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

[nickm at torproject.org]

commit 619cb682f4a28cfc4397e3558289c3719b9c8f32
Merge: ad024c86c e03bb35f9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 12 12:46:12 2020 -0400

    Merge branch 'maint-0.4.3' into release-0.4.3

 changes/ticket33361              |  3 +++
 src/feature/relay/relay_config.c | 12 ++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)