Merge branch 'maint-0.2.2'

This commit is contained in:
Roger Dingledine 2012-02-09 04:02:18 -05:00
commit 929ebde2b9
2 changed files with 1 additions and 4 deletions

View File

@ -1,3 +0,0 @@
o Minor bugfixes (documentation):
- Fix the URL for the online version of the manual that's listed in
torrc.sample.

View File

@ -6,7 +6,7 @@
## that begin with just "#" are disabled commands: you can enable them
## by removing the "#" symbol.
##
## See 'man tor', or https://www.torproject.org/docs/tor-manual.html,
## See 'man tor', or https://www.torproject.org/tor-manual.html,
## for more options you can use in this file.
##
## Tor will look for this file in various places based on your platform: