commit d17ddb8393b206748d19e3717f41146dbdd245d9 Merge: 81d71f0d4 3ee4c9b1f Author: Nick Mathewson <nickm@torproject.org> Date: Sun Apr 15 15:41:24 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(-)