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

[nickm at torproject.org]

commit 61d795f856ea539d38d36cf7e414b070d9551078
Merge: fa6a228 e718a58
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 15 12:55:26 2016 -0400

    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(-)