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

[nickm at torproject.org]

commit e1af8fd61757fa50380111b047219e942935a2c5
Merge: fbe15d1d7 151d5eded
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 25 09:29:00 2017 -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(-)