commit 7c4a06dc21565b3d447bea7dc958ee8c08ff79ba Merge: f666aaa ec291f3 Author: Erinn Clark <erinn@torproject.org> Date: Tue Aug 13 09:58:04 2013 +0200 Merge branch 'maint-2.4' build-scripts/recommended-versions | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)