[tor-commits] [globe/master] Merge commit '5472eba12f1f9c4349493917ab0a17053fd277d7' from Syrup-tan/master

[isis at torproject.org]

commit b6133fa5389e985bf41a44bbabaae0366968a946
Merge: 77cb5a5 5472eba
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Nov 12 23:05:53 2014 +0000

    Merge commit '5472eba12f1f9c4349493917ab0a17053fd277d7' from Syrup-tan/master

 README.md |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)