commit 124d8ec7b21e9afb4d2e6d739c267b7573cc740a Merge: c752b1b43 6f3f93d86 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 19 08:52:59 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(-)