commit 34fde62f71b02b9ca7a2140d649d55dc9eb8269b Merge: 8208f56 8adf21e Author: Erinn Clark erinn@torproject.org Date: Wed Jun 12 19:55:09 2013 -0300

Merge branch 'maint-2.4'

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