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

[teor at torproject.org]

commit 7043be968a6ebe6fe56f139fc8db372aa9a7379a
Merge: de6ceb0be 29940511e
Author: teor <teor at torproject.org>
Date:   Mon Nov 11 14:19:47 2019 +1000

    Merge branch 'maint-0.4.0' into maint-0.4.1

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