commit 74f861b295fc59ae2567b5ec78e2a46d66e44630
Merge: 0c2e4ae 99b59de
Author: Nick Mathewson <[email protected]>
Date: Tue Mar 10 08:21:53 2015 -0400
Merge branch 'maint-0.2.6' into release-0.2.6
Conflicts:
configure.ac
contrib/win32build/tor-mingw.nsi.in
src/win32/orconfig.h
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
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
