commit 79ae3b4abfdcb1c8170380ab6e75fb910d775667 Merge: aa89500 875b1fb Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jun 8 14:06:57 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(-)