commit 53fb950252095b014eb2a003e568a577d993b9f3 Merge: 06352bd 8e41d82 Author: Erinn Clark erinn@torproject.org Date: Sat May 12 20:10:03 2012 -0300

Merge branch 'maint-2.2' into maint-2.3

build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)