commit 817cf018312f5788c92bbf49fe07b3a0698f11e7 Merge: 4b332ce62a 62b98716ff Author: Alexander Færøy <ahf@torproject.org> Date: Fri Feb 5 17:17:04 2021 +0000 Merge branch 'maint-0.4.4' into release-0.4.4 scripts/maint/practracker/exceptions.txt | 1 + src/test/test_switch_id.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)