[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5

[nickm at torproject.org]

commit 9b5ea2215fd9553591a7c88562cd68c83e267dd6
Merge: 1a910a10a8 1ec4c7b34a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 16 08:21:28 2021 -0400

    Merge branch 'maint-0.4.5' into release-0.4.5

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