commit 26c9afc3860494457b20a33b65d7c2bd459cdd94 Merge: fab91a2 83dc072 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jun 29 18:48:33 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(-)