commit 5dd67736d8e34aaa1d27996014016041b3f46c6d Merge: a7e73ba f6bad89 Author: Erinn Clark <erinn@torproject.org> Date: Wed Jun 26 20:01:38 2013 -0300 Merge branch 'maint-2.4' build-scripts/recommended-versions | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)