commit c6d006f071f7a8dcd716365804ca416d6813f3e6 Merge: 7acecea ab05ecd Author: Erinn Clark erinn@torproject.org Date: Wed Apr 25 13:42:44 2012 -0300

Merge branch 'maint-2.2' into maint-2.3

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