Merge branch 'maint-0.2.1' into release-0.2.1

This commit is contained in:
Roger Dingledine
2011-10-26 17:13:18 -04:00
10 changed files with 16 additions and 13 deletions
+4
View File
@@ -0,0 +1,4 @@
o Removed options:
- Remove undocumented option "-F" from tor-resolve: it hasn't done
anything since 0.2.1.16-rc.
+4
View File
@@ -0,0 +1,4 @@
o Minor bugfixes:
- Fix warnings from GCC 4.6's "-Wunused-but-set-variable" option.
Fixes bug 3208.