commit 9ca7900e177d454a47973efe25045bb4022b0508 Merge: df3f2bd9a e03bb35f9 Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 12 12:46:12 2020 -0400

Merge branch 'maint-0.4.3'

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