commit fd39bf05cc4c75ec2684dbc560c37ec42afaac62 Merge: 2c46dfe 79c2018 Author: Erinn Clark <erinn@torproject.org> Date: Wed Aug 29 19:08:11 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)