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

[nickm at torproject.org]

commit 396ac67f62de47648193b922122da65a392a1b98
Merge: 40233ca 550c033
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 11 21:44:03 2014 -0400

    Merge branch 'maint-0.2.5' into release-0.2.5
    
    This is a "theirs" merge, to get the version number bumped to
    0.2.5.7-rc-dev.

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