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

[nickm at torproject.org]

commit e18bf39e66eef181be5fa054d6a1bf806242fde6
Merge: 62a500dd1d 91aec8dbc1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 14 11:49:01 2021 -0400

    Merge branch 'maint-0.4.6' into release-0.4.6

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