commit 3211e6704b6b6b967c09575a3473dce9f72649ce Merge: 7c81abb b049a5b Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 28 10:39:07 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(-)