commit eede3a171a2b07b49270c1494576c2823ea8b6e2 Merge: 74d0918 1122137 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 2 11:19:59 2016 -0500

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(-)