commit 3b533bda2625f7682ea0d4780b87860e06184dc2 Merge: 6045c26d8 de129e69b Author: Nick Mathewson <nickm@torproject.org> Date: Tue Aug 7 20:16:02 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(-)