commit 73f78a4888b3bb01a1586cba5aca8689655c58f5 Merge: f439d0fe44 5c8deef9b6 Author: Alexander Færøy <ahf@torproject.org> Date: Fri Oct 29 16:56:32 2021 +0000 Merge branch 'maint-0.3.5' into release-0.3.5 src/test/test_switch_id.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)