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

[nickm at torproject.org]

commit 635c59d553e420c4c54b95ac56b7d52f53a53111
Merge: 4fd31340f a56b9501f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 21 13:25:39 2019 -0500

    Merge branch 'maint-0.3.4' into release-0.3.4

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