commit 4902cfcf19a8c529bc43f9bb4c170ed3b9680bf6 Merge: 6d0f332a2 6bda6777c Author: Nick Mathewson <nickm@torproject.org> Date: Thu Nov 30 12:28:39 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(-)