Merge branch 'prop221_squashed_024'

Conflicts:
	src/or/or.h
This commit is contained in:
Nick Mathewson
2013-11-01 10:28:01 -04:00
7 changed files with 26 additions and 11 deletions
+6
View File
@@ -0,0 +1,6 @@
o Minor features:
- Stop sending the CREATE_FAST cells by default; instead, use a
parameter in the consensus to decide whether to use
CREATE_FAST. This can improve security on connections where
Tor's circuit handshake is stronger than the available TLS
connection security levels. Implements proposal 221.