commit c9e5a69dd720e0149ad049815aee01d9c85794b8 Merge: 247c163ac 6c836b9e8 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jun 25 14:07:32 2018 -0400 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(-)