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

[dgoulet at torproject.org]

commit c2e81c47042ed8b17680006dfdb316467606e8fa
Merge: 9e26a9399f af5250b1df
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 22 11:55:37 2021 -0500

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