Nick Mathewson bd169aa9a5 Merge remote-tracking branch 'public/bug11553_024' into bug11553_025 ...

Conflicts:
	src/or/channel.h

2014-04-18 13:00:45 -04:00

..

bug11553

Switch to random allocation on circuitIDs.

2014-04-18 12:58:58 -04:00

ticket11528

Elevate server TLS cipher preferences over client

2014-04-17 10:33:04 -04:00