commit 60647e1d1a145a276eda6d79471ef7c25f294cf4
Merge: 27416df 74b49b8
Author: Sebastian Hahn <sebastian at torproject.org>
Date: Tue Dec 9 18:58:47 2014 +0100
Merge branch 'master' into staging
include/tor-mirrors.csv | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)