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

Mon Apr 1 23:13:51 UTC 2013

commit 71ff1a2d8edb59c00ecf0aefe7173e4dbcc7d0b2
Merge: 60b1fd9 dbfd8ee
Author: Erinn Clark <erinn at torproject.org>
Date:   Mon Apr 1 19:13:38 2013 -0400

    Merge branch 'maint-2.4'

 README.LINUX-2.3      |    4 ++--
 README.LINUX-2.4      |    4 ++--
 README.OSX-2.3        |    4 ++--
 README.OSX-2.4        |    4 ++--
 README.WIN-2.3        |    4 ++--
 README.WIN-2.4        |    4 ++--
 changelog.linux-2.3   |    7 +++++++
 changelog.linux-2.4   |    7 +++++++
 changelog.osx-2.3     |    7 +++++++
 changelog.osx-2.4     |    7 +++++++
 changelog.windows-2.3 |    7 +++++++
 changelog.windows-2.4 |    7 +++++++
 12 files changed, 54 insertions(+), 12 deletions(-)