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

[nickm at torproject.org]

commit 575a86cc3c1cf3e468214e1a4f762a4ef1806c8e
Merge: 1826ff653 35753c077
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 1 16:44:31 2018 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

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