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

[erinn at torproject.org]

commit 1166edb3a11b70eb17ce9107ee62ab2b65646ab5
Merge: 25a4e60 1a2ab46
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu Oct 31 14:47:45 2013 -0200

    Merge branch 'maint-2.4'

 changelog.linux-2.3   |   16 ++++++++++++++--
 changelog.linux-2.4   |   16 ++++++++++++++--
 changelog.osx-2.3     |   16 ++++++++++++++--
 changelog.osx-2.4     |   16 ++++++++++++++--
 changelog.windows-2.3 |   17 ++++++++++++++---
 changelog.windows-2.4 |   16 ++++++++++++++--
 6 files changed, 84 insertions(+), 13 deletions(-)