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

[nickm at torproject.org]

commit b91126b5464f4bea366a5f771b01dfa95e121221
Merge: c5a68c185 ab92881d9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 19 11:37:15 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(-)