[tor-commits] [webwml/master] Merge branch 'master' into staging

[sebastian at torproject.org]

commit 8a883c0f3cc928f02ab1c4af81be6ef2f7021c50
Merge: cbb4f2a d144128
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Sat Dec 20 16:17:25 2014 +0100

    Merge branch 'master' into staging

 include/tor-mirrors.csv |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)