commit b8bfea163967289749369a3acb1f4f41dbf513ed Merge: 971a6beff c5e610af0 Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 30 11:19:55 2020 -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(-)