commit ee24c18f1366a3afa2c8642441ca42bb3c1f8c3b Merge: b5188b2 240ba48 Author: Erinn Clark <erinn@torproject.org> Date: Mon Jul 8 22:13:29 2013 -0300 Merge branch 'maint-2.4' build-scripts/recommended-versions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)