[tor-commits] [tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2

[teor at torproject.org]

commit 8b1f99c29d6bcdbd3598b835b7084cee30383d01
Merge: 1f3bf10d3 7043be968
Author: teor <teor at torproject.org>
Date:   Mon Nov 11 14:19:55 2019 +1000

    Merge branch 'maint-0.4.1' into maint-0.4.2

 .appveyor.yml    | 2 +-
 changes/bug32449 | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)