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

[nickm at torproject.org]

commit 0d402eefa55716086db2c871e05d42e5667643ab
Merge: 9a37cf4883 b3fe9d5162
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 7 13:32:36 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(-)