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

[nickm at torproject.org]

commit 2c57e3e5e9e21e73c55259483de97c9753935e73
Merge: 1f41088 4915d9c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 8 09:29:49 2017 -0400

    Merge branch 'maint-0.2.7-redux' into release-0.2.7-redux

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