[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2

[ahf at torproject.org]

commit 19d579e8cbb7bd95ed4fd50697c689ab7b725963
Merge: 07d8d398c d9cc2b292
Author: Alexander Færøy <ahf at torproject.org>
Date:   Tue Jul 7 14:48:35 2020 +0000

    Merge branch 'maint-0.3.5' into maint-0.4.2

 .appveyor.yml       | 2 +-
 changes/ticket40026 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)