commit 5c5298e4ff1a3fdeb7e19094bf150828d8eb96e7 Merge: 30844dd 884b371 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 28 10:25:01 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(-)