commit 2f4e9b59d6bfb36cdc6ca108b9b210c37dd0a67f Merge: 92f6355 a364852 Author: Erinn Clark <[email protected]> Date: Thu Apr 26 13:50:26 2012 -0300
Merge branch 'maint-2.2' into maint-2.3
build-scripts/osx.mk | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
