commit 3929dc3010e8201fa0332112d8210ec039991002 Merge: 33a0e016e0 3496804827 Author: Alexander Færøy <ahf@torproject.org> Date: Fri Feb 5 17:17:05 2021 +0000 Merge branch 'maint-0.4.5' into release-0.4.5 scripts/maint/practracker/exceptions.txt | 1 + src/test/test_switch_id.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)