commit 598c61362f1b3d3e3a93d15240c7306d955273be Merge: 9ac1695 fcbb21b Author: Roger Dingledine <arma@torproject.org> Date: Mon Jul 28 04:08:18 2014 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 Conflicts: configure.ac contrib/tor-mingw.nsi.in src/win32/orconfig.h configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)