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

[nickm at torproject.org]

commit c3a3539da82177e41275dd8a2761b43b75fd7a9c
Merge: 948e9bf6c e66533bef
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 5 13:33:04 2019 -0500

    Merge branch 'maint-0.4.0' into release-0.4.0

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