commit b9c29105f1f8c6a5a50212b84e8dd06b7e9e4ff8 Merge: bebf7eb54 2d55620a9 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 5 08:31:01 2017 -0400 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(-)