commit e34700e4718d23bdd92bd5ba172118c13c45a8bf Merge: 57c6895 cf6da1e Author: Nick Mathewson <nickm@torproject.org> Date: Sun Dec 11 21:40:20 2016 -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(-)