Merge remote branch 'origin/maint-0.2.2'

Conflicts:
	src/or/buffers.c
This commit is contained in:
Nick Mathewson
2011-01-10 17:31:11 -05:00
2 changed files with 14 additions and 3 deletions
+7
View File
@@ -0,0 +1,7 @@
o Minor bugfixes
- Handle SOCKS messages longer than 128 bytes long correctly, rather
than waiting forever for them to finish. Fixes bug 2330. Bugfix on
0.2.0.16-alpha. Found by doorss.