commit c4a91e04247bfb2b6c61616a4c41a00223487464 Merge: 7968bab 4732e15 Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 8 09:04:44 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(-)