commit 8661230fbb1bbe7e7dc7e5286f73ca16de818c1d Merge: 5ba3107 d4653ad Author: Erinn Clark erinn@torproject.org Date: Tue May 14 09:37:50 2013 -0300

Merge branch 'maint-2.4'

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