commit 01a00d0f94e7d8f89cc5244c8b49bf27bc37f797 Merge: 1fe5097 b5526be Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 28 10:27:29 2017 -0500

Merge branch 'maint-0.2.7-redux' into release-0.2.7-redux

configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)