Merge remote branch 'origin/maint-0.2.2'

Conflicts:
	src/or/buffers.c
This commit is contained in:
Nick Mathewson
2010-11-15 15:37:23 -05:00
2 changed files with 41 additions and 35 deletions
+3
View File
@@ -0,0 +1,3 @@
o Minor bugfixes:
- Rate-limit the "your application is giving Tor only an IP address"
warning. Fixes bug 2000; bugfix on 0.0.8pre2.