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

[nickm at torproject.org]

commit 58378c27ea59c101d47a5a16a64bddee686e75f1
Merge: aca4d1524 2f4fa423c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 13 16:57:42 2020 -0400

    Merge branch 'maint-0.4.2' into release-0.4.2

 configure.ac                        | 4 ++--
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)