Commit 929ebde2 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

Merge branch 'maint-0.2.2'

parents ca431c54 85c53900

changes/manual_uri_in_torrc

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
  o Minor bugfixes (documentation):

   - Fix the URL for the online version of the manual that's listed in

     torrc.sample.

src/config/torrc.sample.in

+1 −1
Original line number Diff line number Diff line
@@ -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: