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

[erinn at torproject.org]

commit b5188b2676e52a11d41e98becf5cea27c69f4e30
Merge: 6acfa0b ce483b5
Author: Erinn Clark <erinn at torproject.org>
Date:   Sun Jul 7 18:44:18 2013 -0300

    Merge branch 'maint-2.4'

 README.LINUX-2.4                |    6 +++---
 README.OSX-2.4                  |    6 +++---
 README.WIN-2.4                  |    6 +++---
 build-scripts/config/Info.plist |    6 +++---
 build-scripts/versions-alpha.mk |    6 +++---
 changelog.linux-2.4             |    7 +++++++
 changelog.osx-2.4               |    7 +++++++
 changelog.windows-2.4           |    7 +++++++
 8 files changed, 36 insertions(+), 15 deletions(-)