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

[nickm at torproject.org]

commit 65187d9de7b5a8696f439d633fcf2791dd346343
Merge: 386876971 7a9e2a261
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 13 16:57:42 2020 -0400

    Merge branch 'maint-0.4.1' into release-0.4.1

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