commit e03312688e146ab90aae1a6004710a411259d28a
Merge: 7a489a6 aa40f28
Author: Nick Mathewson <ni...@torproject.org>
Date: Thu Dec 10 14:25:01 2015 -0500
Merge branch 'maint-0.2.7' into release-0.2.7
configure.ac | 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
