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

This commit is contained in:
Nick Mathewson 2012-02-08 10:52:34 -05:00
commit ca431c5400

View File

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