Nick Mathewson bd169aa9a5 Merge remote-tracking branch 'public/bug11553_024' into bug11553_025 %!s(int64=12) %!d(string=hai) anos
..
bug11553 0d75344b0e Switch to random allocation on circuitIDs. %!s(int64=12) %!d(string=hai) anos
ticket11528 0b319de60f Elevate server TLS cipher preferences over client %!s(int64=12) %!d(string=hai) anos