commit be3baeb879387154ec5eae0cf9487ff1e489f4d3 Merge: 0e10a162b 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 release-0.4.2 .appveyor.yml | 2 +- changes/ticket40026 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)