commit fe328e2f332662d7bf16adaa18f6c96c43b3f83f Merge: a4e8624db1 ed7f4ad4a9 Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 7 13:32:35 2021 -0400

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(-)