commit 5ced052a1e95b7632b97f115dce4c2264994895f Merge: 61c139360 afee78541 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jul 9 09:24:48 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(-)