commit c4f0b33e43eaae5fab36242b92b51c35111f286f Merge: 88dd6445e 16c9cfd65 Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 30 12:28:39 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(-)