commit 31417631cb5305647423d91df395e4303e475987 Merge: 66801bc90 2cb8c8d99 Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 31 14:32:14 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(-)