[tor-commits] [torbrowser/master] Merge branch 'maint-2.4'

[erinn at torproject.org]

commit 8208f568391aea75f19e869edbaa370a8301e7d4
Merge: 6b6942b 61cbe3f
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Jun 12 18:46:08 2013 -0300

    Merge branch 'maint-2.4'

 README.LINUX-2.3          |    4 ++--
 build-scripts/versions.mk |    4 ++--
 changelog.linux-2.3       |    4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)