commit 7d76df2a1d0cd09f3ee2d842d87df3b71b138e6b Merge: 3993b0d 5c4983d Author: Erinn Clark erinn@torproject.org Date: Wed Jun 19 21:06:39 2013 -0300

Merge branch 'maint-2.4'

README.LINUX-2.4 | 6 +++--- README.OSX-2.4 | 6 +++--- README.WIN-2.4 | 6 +++--- build-scripts/linux-alpha.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/versions-alpha.mk | 12 ++++++------ build-scripts/windows-alpha.mk | 2 +- changelog.linux-2.4 | 10 ++++++++++ changelog.osx-2.4 | 10 ++++++++++ changelog.windows-2.4 | 10 ++++++++++ 10 files changed, 48 insertions(+), 18 deletions(-)