commit 12da9f9a3fae02c2e978cf77db8abdedd46ef11d Merge: c789d36 3cef019 Author: Erinn Clark erinn@torproject.org Date: Tue Sep 17 20:45:13 2013 +0200

Merge branch 'maint-2.4'

build-scripts/versions-alpha.mk | 2 +- build-scripts/versions.mk | 2 +- changelog.linux-2.3 | 3 ++- changelog.linux-2.4 | 3 ++- changelog.osx-2.3 | 3 ++- changelog.osx-2.4 | 3 ++- changelog.windows-2.3 | 3 ++- changelog.windows-2.4 | 3 ++- 8 files changed, 14 insertions(+), 8 deletions(-)