commit a860ada152356b6cca59c1d5cdf1d562392a4387 Merge: e707045 aed454b Author: Erinn Clark <erinn@torproject.org> Date: Thu Nov 14 16:28:11 2013 -0200 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 | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions-alpha.mk | 4 ++-- build-scripts/versions.mk | 4 ++-- build-scripts/windows-alpha.mk | 2 +- build-scripts/windows.mk | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-)