commit 4cf9d65050bff2e9377ae654c7a513f89a0b3e37 Merge: 2e47bfad4 42e12a353 Author: Nick Mathewson nickm@torproject.org Date: Mon Sep 18 14:40:55 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(-)