commit 1f5b228ee89f237fa653313fb1824b60a717441f
Merge: a8d6eb3 fed78bc
Author: Nick Mathewson <[email protected]>
Date: Mon Oct 20 10:30:58 2014 -0400
Merge branch 'maint-0.2.4' into release-0.2.4
Conflicts:
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
contrib/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
