commit 9cb1c2b4ad37f7af1c0d58858f0e5fbe04f33730 Merge: 7d83cfb3a 162a087e5 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Dec 1 09:35:43 2017 -0500 Merge branch 'maint-0.2.5' into release-0.2.5 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)