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

commit dce1811cb8d9867f7d4e7fe1d24ebd99f3d59441 Merge: 96ece9f0a f7b06202c Author: Nick Mathewson <nickm@torproject.org> Date: Thu Sep 14 13:22:17 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(-)