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

[ahf at torproject.org]

commit 07ca2a8ee9aa5a011e90ff85f5bb80b72d4fbbaa
Merge: 7a152997fe 3496804827
Author: Alexander Færøy <ahf at torproject.org>
Date:   Fri Feb 5 17:17:05 2021 +0000

    Merge branch 'maint-0.4.5'

 scripts/maint/practracker/exceptions.txt | 1 +
 src/test/test_switch_id.c                | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)