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

[nickm at torproject.org]

commit 42e925353c1fce9828765634a83c318cab2d89aa
Merge: f5951b7 f93bcab
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 28 10:38:19 2017 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8

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