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

[nickm at torproject.org]

commit e0b77cd3194d705f9bca254f8a95e520070ca365
Merge: eea9054 77c671b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 18 09:10:55 2015 -0400

    Merge branch 'maint-0.2.6' into release-0.2.6

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