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

[nickm at torproject.org]

commit 82957bf91ae6326b82fb3bb5ce8107f64c2d41ae
Merge: 46e2c15 57ba7ab
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 24 11:02:17 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(-)