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

[nickm at torproject.org]

commit 96a8773f0d0da751e58b5460b23adf26006c2618
Merge: 74cad1469 190cda0e2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 18 12:18:31 2020 -0400

    Merge branch 'maint-0.4.2' into release-0.4.2

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