commit 74882c781c46bf1781c65cd629c41eea191678db Merge: f95f6a449 b65024f57 Author: Nick Mathewson <nickm@torproject.org> Date: Sat Apr 14 12:22:00 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)