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

Fri Apr 26 02:34:09 UTC 2013

commit c2db02c083f4a3af4799a4528bdcaaa6770977b7
Merge: da7680a d0227aa
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu Apr 25 23:33:56 2013 -0300

    Merge branch 'maint-2.4'

 README.LINUX-2.4               |    8 ++++----
 README.OSX-2.4                 |    8 ++++----
 README.WIN-2.4                 |    8 ++++----
 build-scripts/linux-alpha.mk   |    2 +-
 build-scripts/osx-alpha.mk     |    2 +-
 build-scripts/windows-alpha.mk |    2 +-
 changelog.linux-2.4            |   31 +++++++++++++++++++++++++++++++
 changelog.osx-2.4              |   31 +++++++++++++++++++++++++++++++
 changelog.windows-2.4          |   31 +++++++++++++++++++++++++++++++
 9 files changed, 108 insertions(+), 15 deletions(-)