commit c1237ed5161ca6397592ba3da3520bf8af6f23f9 Merge: 5a4caad 3a5d4d6 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Apr 6 09:57:08 2015 -0400 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(-)