commit 43c354d48b442a6bb11982b8ee5117db2a8e9627 Merge: e057a19b7 b203dedaf Author: Nick Mathewson <nickm@torproject.org> Date: Mon Sep 10 09:42:57 2018 -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(-)