commit 9dcbd241d97dcbf0024acdab5391840bbd04e7a8 Merge: 5a0466d 9c8e987 Author: Erinn Clark <erinn@torproject.org> Date: Tue May 1 00:07:40 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)