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

[nickm at torproject.org]

commit 023ce9e0f8701aa67c7eab29582454ee01b517dc
Merge: 334f4f6 3202ac6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 20 10:33:18 2014 -0400

    Merge branch 'maint-0.2.5' into release-0.2.5
    
    Conflicts:
    	configure.ac
    	contrib/win32build/tor-mingw.nsi.in
    	src/win32/orconfig.h

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