commit c04339810badd64f7bec9cf9f1716a9f37c58630
Merge: da84aec ec19ecc
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Fri Sep 23 15:58:14 2016 -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(-)