[tor-commits] [torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3

[erinn at torproject.org]

commit 3f22b939ca27e1e9ac38563a79d20d2d403f4021
Merge: cb165cf c94869d
Author: Erinn Clark <erinn at torproject.org>
Date:   Mon Mar 19 01:11:43 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

 build-scripts/linux.mk           |    2 +-
 changelog.linux-2.2              |    7 +++++++
 src/RelativeLink/RelativeLink.sh |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)