[tor-commits] [tor/master] Merge branch 'maint-0.2.5'

[arma at torproject.org]

commit e3f4a96528ad52c480a360bf7782446f5a06f622
Merge: 6c4a26b 7760916
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Jul 28 04:14:39 2014 -0400

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