commit badc444f7adce748fd4c4171a3748fc08f001022 Merge: 44c5fc6 b0f1241 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Oct 17 16:32:17 2016 -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(-)