commit 4ab3fe6d26246ea5cb0c10bc8610b8fcb88c11cc Merge: 3ce0237 bff08ed Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 8 09:29:49 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(-)