commit cb24a6e95b013e42f72367af401dc8ee3499fb5f Merge: 9db4078 8dae835 Author: Erinn Clark <erinn@torproject.org> Date: Thu Mar 15 18:06:53 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 src/RelativeLink/RelativeLink.sh | 19 +++++++++++++++++++ src/RelativeLink/RelativeLinkOSX.sh | 18 ++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-)