commit 0dea11b03e0ca49d784872ec37b23470ac825849 Merge: 81cce30 8730d9e Author: Erinn Clark erinn@torproject.org Date: Tue Aug 6 15:19:05 2013 +0200

Merge branch 'maint-2.4'

README.LINUX-2.3 | 6 +++--- README.LINUX-2.4 | 8 ++++---- README.OSX-2.3 | 6 +++--- README.OSX-2.4 | 8 ++++---- README.WIN-2.3 | 6 +++--- README.WIN-2.4 | 8 ++++---- build-scripts/linux-alpha.mk | 2 +- build-scripts/linux.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions-alpha.mk | 8 ++++---- build-scripts/versions.mk | 8 ++++---- build-scripts/windows-alpha.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.3 | 9 +++++++++ changelog.linux-2.4 | 10 ++++++++++ changelog.osx-2.3 | 8 ++++++++ changelog.osx-2.4 | 9 +++++++++ changelog.windows-2.3 | 8 ++++++++ changelog.windows-2.4 | 9 +++++++++ 20 files changed, 88 insertions(+), 35 deletions(-)