Explorar o código

Merge branch 'maint-0.2.2'

Roger Dingledine %!s(int64=12) %!d(string=hai) anos
pai
achega
929ebde2b9
Modificáronse 2 ficheiros con 1 adicións e 4 borrados
  1. 0 3
      changes/manual_uri_in_torrc
  2. 1 1
      src/config/torrc.sample.in

+ 0 - 3
changes/manual_uri_in_torrc

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

+ 1 - 1
src/config/torrc.sample.in

@@ -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: