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

[nickm at torproject.org]

commit ed8362718fdf04d149aaf4df2cd9e9dda3329e24
Merge: 00a9fafdb da29074fc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 7 15:13:01 2018 -0400

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