commit 7caba4b27e9645e7da39379b16ecce8a643540cf Merge: edd91f5 aaed240 Author: Erinn Clark <[email protected]> Date: Wed Apr 4 17:01:28 2012 -0300
Merge branch 'maint-2.2' into maint-2.3
build-scripts/linux.mk | 7 ++++---
build-scripts/osx.mk | 6 ++++--
build-scripts/windows.mk | 6 ++++--
3 files changed, 12 insertions(+), 7 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
