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

[nickm at torproject.org]

commit 235083308add586c0b86b2e0ce8af7c9a7f4b5c0
Merge: f3c581ee2 dc3890439
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 1 09:35:43 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(-)