commit 6bf06c5656ddd2c3649db790b3bdbb14eb50aaee Merge: 78d9af3 a00d07a Author: Nick Mathewson <nickm@torproject.org> Date: Thu Mar 12 10:53:21 2015 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 Conflicts: configure.ac contrib/win32build/tor-mingw.nsi.in src/win32/orconfig.h configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)