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

[nickm at torproject.org]

commit f01f8e18b80b195f49cb48561b85f6eaae85e8cb
Merge: 6f3f753 7fb19f1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 10 10:05:08 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(-)