commit e0a96cf2b6d2c21e0c8db0a285c0a86286e47821 Merge: e51b25c02d fa438b6cf0 Author: David Goulet dgoulet@torproject.org Date: Thu Oct 28 09:42:43 2021 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

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