commit 07862d84359360e6ea3d7fa2dfae47ad8f8fb264 Merge: d9c230e a535735 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 29 16:37:21 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(-)