Merge remote-tracking branch 'origin/maint-0.2.2'

This commit is contained in:
Nick Mathewson
2011-05-28 01:55:34 -04:00
9 changed files with 15 additions and 13 deletions
+6
View File
@@ -0,0 +1,6 @@
o Removed options:
- Remove undocumented option "-F" from tor-resolve: it hasn't done
anything since 0.2.1.16-rc.
o Minor bugfixes:
- Fix warnings from GCC 4.6's "-Wunused-but-set-variable" option.