commit 5ba3107d84c985e175d82e134554089ee83e327a Merge: ff23c5f 2179756 Author: Erinn Clark <erinn@torproject.org> Date: Sun May 12 22:20:53 2013 -0300 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 ++-- build-scripts/linux-alpha.mk | 2 +- build-scripts/linux.mk | 6 +++--- build-scripts/osx-alpha.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/windows-alpha.mk | 2 +- build-scripts/windows.mk | 2 +- 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 +++++++ 18 files changed, 62 insertions(+), 20 deletions(-)