commit 8d34a6ea9c7dae39b3e6066e9c207346f58ebf70 Merge: e38b0c2eb 26f68dfce Author: Nick Mathewson <nickm@torproject.org> Date: Thu Sep 14 13:22:17 2017 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)