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

[nickm at torproject.org]

commit 06df2f51d793ada367a291a9770544b178db2239
Merge: de79264c1 7afb95d3e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 30 11:19:55 2020 -0500

    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(-)