commit f9e5362ade10666fc6ee8ae9e2a9e7c25c6e3c73 Merge: f94575126 49b4d1765 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 9 13:15:59 2020 -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(-)