commit c7a53ba99d593969b89546123b62e862ea43a6e7 Merge: 3fba40e 55976ea Author: Erinn Clark erinn@torproject.org Date: Sat Jun 9 05:26:37 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(-)