Merge remote-tracking branch 'public/feature9777_024_squashed'

Conflicts:
	src/or/circuitbuild.c
This commit is contained in:
Nick Mathewson
2014-02-07 10:47:34 -05:00
4 changed files with 81 additions and 10 deletions
+3
View File
@@ -0,0 +1,3 @@
o Minor features:
- Avoid using circuit paths if no node in the path supports the ntor
circuit extension handshake. Implements ticket 9777.