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

[nickm at torproject.org]

commit bb8c4e69ca5c8bcad7d66b2ad502ab35b1a5032b
Merge: 5ebe7f2 dfd6cf9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 24 10:23:44 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(-)