commit 50b503a9f90f67e7898efdb560e5fdb577f1a1c6
Merge: dfddfa833 3efd60474
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Thu Jul 9 10:32:39 2020 -0400
Merge branch 'maint-0.4.4' into release-0.4.4
configure.ac | 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)