[tor-commits] [tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4

[nickm at torproject.org]

commit 7d5ddde4872d87cdc28f203ede8ff4038efa9886
Merge: da85052 542100d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 6 09:49:06 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(-)