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

[nickm at torproject.org]

commit 1992ed67563f110c2fe87a97e5a03d1a442bdfa5
Merge: c174f06 8f44d28
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 5 13:05:42 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(-)