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

[nickm at torproject.org]

commit 8b03ae1e57dee88124f5660faabd0995deff0fe0
Merge: 924d1ebb3 f470b863a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 29 19:44:48 2020 -0500

    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(-)