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

commit 9eef1d680cec9c87170aeebca023349eea55a0d3 Merge: 0cfb7f6ce 70755eca0 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Nov 12 16:40:00 2019 -0500 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(-)