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

[nickm at torproject.org]

commit e46ea4a75da3fafcb74e8d50faa3df116e1c8eda
Merge: 4dd7a55 741d2dc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 13 08:41:42 2015 -0500

    Merge branch 'maint-0.2.7' into release-0.2.7

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