commit b5e0abe18604e1f73ba9a709d505f15fbb9a5f90 Merge: 7aa1e9b61 bfea7a732 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 9 08:39:16 2020 -0400

Merge branch 'maint-0.4.3' into release-0.4.3

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