commit ccaaff799914e929231ec69d22d2d6fb725663b1 Merge: 52906e8 fa3a87a Author: Erinn Clark erinn@torproject.org Date: Sun Aug 28 13:09:49 2011 +0100

Merge branches 'fixes-2011-08-23-01-master' and 'master'

build-scripts/linux.mk | 2 +- src/RelativeLink/RelativeLink.sh | 176 +++++++++++++++++++++++++++++++++---- 2 files changed, 158 insertions(+), 20 deletions(-)