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

[nickm at torproject.org]

commit 9521c3e7be337c1a48098edc5c36a01369d36791
Merge: 0fd0f45761 ce8d6d143c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 10 10:55:16 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(-)