commit 9eaa66db0b2114401f3748c65222c373617e5c0e
Merge: e25e98028 0a72d1c8f
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Mon Sep 18 14:40:55 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(-)