Merge branch 'maint-0.4.1' into maint-0.4.2
commit7a35c8d8bec8243820149b4560429c3b91c35f74
authorNick Mathewson <nickm@torproject.org>
Mon, 21 Oct 2019 22:44:44 +0000 (21 18:44 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 21 Oct 2019 22:44:44 +0000 (21 18:44 -0400)
treee568676d9e503c503de741fc9c8b9384dbcacc26
parent04e9e74f1dd4fad7fe9e072253dd51b9c03bebf2
parent53aa159632ea5138614e974a2709c378dfe53cde
Merge branch 'maint-0.4.1' into maint-0.4.2
.appveyor.yml