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

[nickm at torproject.org]

commit f945751265a140654fdc1a3e900db9affd60ae69
Merge: d3536911e 5aaecf6d0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 9 10:32:39 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(-)