commit 6cbbe16d2f5054a2a46fc1f566a08246f54e46e4 Merge: e399b3e 2958cdb Author: Erinn Clark erinn@torproject.org Date: Thu Sep 5 14:34:57 2013 +0200

Merge branch 'maint-2.4'

README.LINUX-2.4 | 6 +++--- README.OSX-2.4 | 6 +++--- README.WIN-2.4 | 6 +++--- build-scripts/versions-alpha.mk | 8 ++++---- changelog.linux-2.4 | 8 ++++++++ changelog.osx-2.4 | 8 ++++++++ changelog.windows-2.4 | 8 ++++++++ 7 files changed, 37 insertions(+), 13 deletions(-)