commit 94dad8db9e759bd77fe2b46a0e219323ea6f8313 Merge: 1f6c8ed 7549259 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Mar 1 08:19:00 2017 -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(-)