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

[nickm at torproject.org]

commit d8b2b1168e7d30c7f6f4c32b496a0a3c6e22a213
Merge: e0b77cd ca03b10
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 18 16:32:26 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(-)