Nick Mathewson cdc64f020c Merge remote-tracking branch 'public/bug11608' %!s(int64=11) %!d(string=hai) anos
..
bug11608 f4be34f70d Make the python test scripts work on python3 %!s(int64=11) %!d(string=hai) anos
bug11634 6e8ae50938 changes file for 11634 documentation fixes %!s(int64=11) %!d(string=hai) anos
bug11635 4b519de5f9 Actually put ExtORPortCookieAuthFile into config.c %!s(int64=11) %!d(string=hai) anos
ticket8966 703ad69587 Deal with the aftermath of sorting contrib %!s(int64=11) %!d(string=hai) anos