commit a213d2793860240b315f372159311f307aed68ca Merge: 5a5ff3d8c 19d579e8c Author: Alexander Færøy <ahf@torproject.org> Date: Tue Jul 7 14:48:36 2020 +0000 Merge branch 'maint-0.4.2' into maint-0.4.3 .appveyor.yml | 2 +- changes/ticket40026 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)