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

[nickm at torproject.org]

commit aa49562a0520ff3ddbbce9fc5e77acd8dd4a5812
Merge: 83f895c015 d66178c7b7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 16 09:18:52 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(-)