Merge remote-tracking branch 'public/bug4361'

Conflicts:
	src/or/command.c
This commit is contained in:
Nick Mathewson
2012-03-08 14:23:52 -05:00
2 changed files with 24 additions and 4 deletions
+4
View File
@@ -0,0 +1,4 @@
o Minor bugfixes:
- Spec conformance: on a v3 handshake, do not send a NETINFO cell until
after we have received a CERTS cell. Bugfix on 0.2.3.6-alpha;
fixes bug 4361; patch by "frosty".