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

changes/bug6024

+  o Documentation fixes:
+    - Clarify that hidden services are TCP only. Fixes bug 6024.

doc/tor.1.txt

@@ -239,7 +239,7 @@ GENERAL OPTIONS
     recommend that you leave this alone unless you know what you're doing,
     since giving attackers access to your control listener is really
     dangerous. This directive can be specified multiple
-    times to bind to multiple addresses/ports.  (Default: 127.0.0.1) 
+    times to bind to multiple addresses/ports.  (Default: 127.0.0.1)
 
 **ControlSocket** __Path__::
     Like ControlPort, but listens on a Unix domain socket, rather than a TCP
@@ -764,7 +764,7 @@ The following options are useful only for clients (that is, if
     purposes, e.g., for Tor controllers. This option may be used multiple times
     for different hidden services. If a hidden service uses authorization and
     this option is not set, the hidden service is not accessible. Hidden
-    services can be configured to require authorization using the 
+    services can be configured to require authorization using the
     **HiddenServiceAuthorizeClient** option.
 
 **CloseHSClientCircuitsImmediatelyOnTimeout** **0**|**1**::
@@ -1019,7 +1019,7 @@ The following options are useful only for clients (that is, if
     Open this port to listen for transparent proxy connections.  Set this to
     0 if you don't want to allow transparent proxy connections.  Set the port
     to "auto" to have Tor pick a port for you. This directive can be
-    specified multiple times to bind to multiple addresses/ports.  See 
+    specified multiple times to bind to multiple addresses/ports.  See
     SOCKSPort for an explanation of isolation flags. +
  +
     TransPort requires OS support for transparent proxies, such as BSDs' pf or
@@ -1057,7 +1057,7 @@ The following options are useful only for clients (that is, if
 **AutomapHostsOnResolve** **0**|**1**::
     When this option is enabled, and we get a request to resolve an address
     that ends with one of the suffixes in **AutomapHostsSuffixes**, we map an
-    unused virtual address to that address, and return the new virtual address. 
+    unused virtual address to that address, and return the new virtual address.
     This is handy for making ".onion" addresses work with applications that
     resolve an address and then connect to it. (Default: 0)
 
@@ -1767,10 +1767,11 @@ The following options are used to configure a hidden service.
     Configure a virtual port VIRTPORT for a hidden service. You may use this
     option multiple times; each time applies to the service using the most
     recent hiddenservicedir. By default, this option maps the virtual port to
-    the same port on 127.0.0.1. You may override the target port, address, or
-    both by specifying a target of addr, port, or addr:port. You may also have
-    multiple lines with  the same VIRTPORT: when a user connects to that
-    VIRTPORT, one of the TARGETs from those lines will be chosen at random.
+    the same port on 127.0.0.1 over TCP. You may override the target port,
+    address, or both by specifying a target of addr, port, or addr:port.
+    You may also have multiple lines with  the same VIRTPORT: when a user
+    connects to that VIRTPORT, one of the TARGETs from those lines will be
+    chosen at random.
 
 **PublishHidServDescriptors** **0**|**1**::
     If set to 0, Tor will run any hidden services you configure, but it won't
@@ -1795,7 +1796,7 @@ The following options are used to configure a hidden service.
     their configuration file using **HidServAuth**.
 
 **RendPostPeriod** __N__ **seconds**|**minutes**|**hours**|**days**|**weeks**::
-    Every time the specified period elapses, Tor uploads any rendezvous 
+    Every time the specified period elapses, Tor uploads any rendezvous
     service descriptors to the directory servers. This information  is also
     uploaded whenever it changes. (Default: 1 hour)