commit dec3041952ae4c9ea0ed621b149e6e047738c617 Merge: d4e5066bf2 3ebf75993f Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 28 11:20:20 2021 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

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