commit 3afeae424a5173c09d060a75eacdb160f9760da1 Merge: 216bce9 567682b Author: Erinn Clark <erinn@torproject.org> Date: Mon Apr 29 23:43:09 2013 -0300 Merge branch 'maint-2.4' build-scripts/recommended-versions | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)