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

[erinn at torproject.org]

commit 92ca496d92e46fe90f708484dd3bc5d51ecc2347
Merge: 0dea11b 71b45e0
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu Aug 8 14:52:22 2013 +0200

    Merge branch 'maint-2.4'

 changelog.linux-2.3   |    3 ++-
 changelog.linux-2.4   |    3 ++-
 changelog.osx-2.3     |    3 ++-
 changelog.osx-2.4     |    3 ++-
 changelog.windows-2.3 |    3 ++-
 changelog.windows-2.4 |    3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)