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

[nickm at torproject.org]

commit ee4375a98545aa12acc511ccde21de7a0af56043
Merge: bede4ea10 b7d18f861
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 9 16:04:22 2019 -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(-)