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

[nickm at torproject.org]

commit de01c0629659021d8201fcfd6fa97550c28056d9
Merge: bf071e34a 2b54733dc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 2 14:33:22 2019 -0400

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