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

[nickm at torproject.org]

commit bb54bca8759d2c5f6b3f22ba57b7ef22f189e1e4
Merge: a1b8ff682 76939cf29
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 23 20:26:32 2019 -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(-)