commit 404a66ec9398082358fea393a2aba91ec894e3d9 Merge: 83fa4cc 86113b9 Author: Erinn Clark erinn@torproject.org Date: Fri Apr 27 07:24:26 2012 -0300

Merge branch 'maint-2.2' into maint-2.3

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