commit fb739ac5764e9da72622e55283d41c1136ee1067
Merge: 18ee1d2 9157405
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Thu Dec 1 13:34:29 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(-)