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

[nickm@xxxxxxxxxxxxxx]

commit adc99834837fa3c4ccc1139734af83307ce2fcd3
Merge: 3db01d3 2f6be06
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Jun 8 14:06:57 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(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits