commit 7e3d5312ede31d47777fa66d260de8f5dedf8cf1 Merge: a574ab8e2 552b62028 Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 24 09:11:38 2017 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

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