commit 153a0b278f1592d4a0f6c23a82a34a36929e8b0d Merge: 64ac28e 6e90d75 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jun 8 14:06:57 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(-)