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

[nickm at torproject.org]

commit d13db36d84a31bba9af845faac1edf4ffc7c7145
Merge: d2c360c53 e4f66bf7f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 25 11:57:17 2019 -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(-)