commit 22bdc694290c48e959a44e9937d04b0b576e765d Merge: 9e44ed4 5f46a59 Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 12 10:50:28 2015 -0400

Merge branch 'maint-0.2.4' into release-0.2.4

configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)