commit fd59766a9cf5853bce5fa884afed8c8a48ae16b8 Merge: cff872f51 faf568fa7 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 25 09:29:00 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(-)