commit b76cac416eaab4db7e5186b549fd35e7b6a22c54 Merge: 80fa9ed cadb6dc Author: Erinn Clark erinn@torproject.org Date: Wed Nov 6 16:34:42 2013 -0200

Merge branch 'maint-2.4'

build-scripts/recommended-versions | 3 +++ 1 file changed, 3 insertions(+)