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

[sebastian@xxxxxxxxxxxxxx]

commit 60647e1d1a145a276eda6d79471ef7c25f294cf4
Merge: 27416df 74b49b8
Author: Sebastian Hahn <sebastian@xxxxxxxxxxxxxx>
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(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits