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