commit 19602bffbee2a2ad7de5089be6a28e6e28f0e240 Merge: babd102f0 c527a8a9c Author: Nick Mathewson <nickm@torproject.org> Date: Thu Mar 1 16:44:31 2018 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)