commit 5b0211745b145233634f91537ceb41472854f687 Merge: 4d1bbc9 e297669 Author: Erinn Clark <erinn@torproject.org> Date: Fri Aug 17 22:09:38 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)