commit 7a618ec3f0a3f74070a07ada9fa483e83f983791 Merge: 25aefdb 4bd11e4 Author: Erinn Clark erinn@torproject.org Date: Fri Jun 21 19:27:29 2013 -0300

Merge branch 'maint-2.4'

build-scripts/versions-alpha.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)