commit 385cd81996eeca0c0b191001022faf0b89614f8e Merge: 29e03ce f98069d Author: Erinn Clark erinn@torproject.org Date: Sat Dec 1 16:08:25 2012 +0000

Merge branch 'maint-2.3' into maint-2.4

build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/windows.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)