commit a82e8fb15132a8e71b3f21a209999b218f989e4e Merge: 71dd3ae ba5724c Author: Erinn Clark erinn@torproject.org Date: Sat Aug 4 21:05:40 2012 +0100

Merge branch 'maint-2.3'

build-scripts/linux-alpha.mk | 5 +---- build-scripts/osx-alpha.mk | 7 ++----- build-scripts/versions-alpha.mk | 2 +- build-scripts/windows-alpha.mk | 5 +---- 4 files changed, 5 insertions(+), 14 deletions(-)