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

commit 99bc2ac5aa7070290a00f0af705ecc309e8bc9f7 Merge: 716c48c25 d8264ab62 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jul 25 21:52:16 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(-)