commit ee47010e605e2d4c096d7fa8ebb81ddfc07d78c4 Merge: 4d21754 6b740aa Author: Nick Mathewson <nickm@torproject.org> Date: Tue Aug 2 11:13:51 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(-)