commit fb2b8339cb6badc48b0956f1d93aeb818e21e52c Merge: 19b6196f67 7c4fd150cd Author: David Goulet dgoulet@torproject.org Date: Thu Oct 28 09:42:43 2021 -0400

Merge branch 'maint-0.4.5' into release-0.4.5

configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)