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

Conflicts:
	doc/tor.1.txt
This commit is contained in:
Nick Mathewson
2011-02-10 15:52:04 -05:00
3 changed files with 12 additions and 4 deletions
+6
View File
@@ -0,0 +1,6 @@
o Major bugfixes
- Ignore and warn about "PublishServerDescriptor hidserv" torrc
options. The 'hidserv' argument never controlled publication
of hidden service descriptors. Bugfix on 0.2.0.1-alpha.