commit e73fb5b0e9f3c5568bcfd821051d6ccdddf41d87 Merge: 80bfc4719 570d1367e Author: Nick Mathewson <nickm@torproject.org> Date: Thu Oct 24 15:55:51 2019 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)