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

[dgoulet at torproject.org]

commit 366bb3c427f1878bf4b0b0a41d45844c924dfb49
Merge: 135b8eea36 2f87b2ab75
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 23 14:04:35 2020 -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(-)