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

[erinn at torproject.org]

commit 884d6298a6276364e7c169f799085d682b017dde
Merge: 12da9f9 583284c
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri Sep 20 17:52:34 2013 +0200

    Merge branch 'maint-2.4'

 build-scripts/linux-alpha.mk                       |    2 +-
 build-scripts/linux.mk                             |    2 +-
 build-scripts/versions-alpha.mk                    |    2 +-
 changelog.linux-2.3                                |    4 +++-
 changelog.linux-2.4                                |    5 ++++-
 changelog.osx-2.3                                  |    4 +++-
 changelog.osx-2.4                                  |    4 +++-
 changelog.windows-2.3                              |    4 +++-
 changelog.windows-2.4                              |    4 +++-
 .../0014-Add-DDG-and-StartPage-to-Omnibox.patch    |   21 +++++++++-----------
 10 files changed, 31 insertions(+), 21 deletions(-)