commit ee70e2ed6df64c10099350ec654dff65db21011c Merge: af51ac47e 38a58076e Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 24 09:10:42 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(-)