commit d7eef61147d37b45eac53d422025a7ce64392af4 Merge: b05226f05 b440560b8 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 15 09:34:06 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(-)