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

[nickm at torproject.org]

commit cae7051a8e4f8e1ac875362a66fe9e80dcdddf77
Merge: 2af341b2ea aaf062119e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 28 08:05:14 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(-)