commit 0b586b44dd78602a44a1c97df12a67fc9db3b080 Merge: 6c84b12 7760916 Author: Roger Dingledine arma@torproject.org Date: Mon Jul 28 04:15:24 2014 -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(-)