[or-cvs] r24052: {arm} Summary descriptions for client config options (arm/trunk/src)

[Damian Johnson]

Author: atagar
Date: 2011-01-08 04:44:40 +0000 (Sat, 08 Jan 2011)
New Revision: 24052

Modified:
   arm/trunk/src/settings.cfg
Log:
Summary descriptions for client config options



Modified: arm/trunk/src/settings.cfg
===================================================================
--- arm/trunk/src/settings.cfg	2011-01-07 21:06:48 UTC (rev 24051)
+++ arm/trunk/src/settings.cfg	2011-01-08 04:44:40 UTC (rev 24052)
@@ -1,4 +1,5 @@
 # Summary descriptions for Tor configuration options
+# General Config Options
 config.summary.BandwidthRate Average bandwidth usage limit
 config.summary.BandwidthBurst Maximum bandwidth usage limit
 config.summary.MaxAdvertisedBandwidth Limit for the bandwidth we advertise as being available for relaying
@@ -52,6 +53,64 @@
 config.summary.PreferTunneledDirConns Avoids directory requests that can't be made over the ORPort if set
 config.summary.CircuitPriorityHalflife Overwrite method for prioritizing traffic among relayed connections
 
+# Client Config Options
+config.summary.AllowInvalidNodes Permits use of relays flagged as invalid by authorities
+config.summary.ExcludeSingleHopRelays Permits use of relays that allow single hop connections
+config.summary.Bridge Available bridges
+config.summary.LearnCircuitBuildTimeout Toggles adaptive timeouts for circuit creation
+config.summary.CircuitBuildTimeout Initial timeout for circuit creation
+config.summary.CircuitIdleTimeout Timeout for closing circuits that have never been used
+config.summary.CircuitStreamTimeout Timeout for shifting streams among circuits
+config.summary.ClientOnly Ensures not usage as a relay or directory mirror
+config.summary.ExcludeNodes Relays or locales never to be used in circuits
+config.summary.ExcludeExitNodes Relays or locales never to be used for exits
+config.summary.EntryNodes Preferred first hops for circuits
+config.summary.ExitNodes Preferred final hop for circuits
+config.summary.StrictNodes Never uses notes outside of Entry/ExitNodes
+config.summary.FascistFirewall Only make outbound connections on FirewallPorts
+config.summary.FirewallPorts Ports used by FascistFirewall
+config.summary.HidServAuth Authentication credentials for connecting to a hidden service
+config.summary.ReachableAddresses Rules for bypassing the local firewall
+config.summary.ReachableDirAddresses Rules for bypassing the local firewall (directory fetches)
+config.summary.ReachableORAddresses Rules for bypassing the local firewall (OR connections)
+config.summary.LongLivedPorts Ports requiring highly reliable relays
+config.summary.MapAddress Alias mappings for address requests
+config.summary.NewCircuitPeriod Period for considering the creation of new circuits
+config.summary.MaxCircuitDirtiness Duration for reusing constructed circuits
+config.summary.NodeFamily Define relays as belonging to a family
+config.summary.EnforceDistinctSubnets Prevent use of multiple relays from the same subnet on a circuit
+config.summary.SocksPort Port for using tor as a Socks proxy
+config.summary.SocksListenAddress Address from which Socks connections can be made
+config.summary.SocksPolicy Access policy for the pocks port
+config.summary.SocksTimeout Time until idle or unestablished socks connections are closed
+config.summary.TrackHostExits Maintains use of the same exit whenever connecting to this destination
+config.summary.TrackHostExitsExpire Time until use of an exit for tracking expires
+config.summary.UpdateBridgesFromAuthority Toggles fetching bridge descriptors from the authorities
+config.summary.UseBridges Make use of configured bridges
+config.summary.UseEntryGuards Use guard relays for first hop
+config.summary.NumEntryGuards Pool size of guard relays we'll select from
+config.summary.SafeSocks Toggles rejecting unsafe variants of the socks protocol
+config.summary.TestSocks Provide notices for if socks connections are of the safe or unsafe variants
+config.summary.WarnUnsafeSocks Toggle warning of unsafe socks connection
+config.summary.VirtualAddrNetwork Address range used with MAPADDRESS
+config.summary.AllowNonRFC953Hostnames Toggles blocking invalid characters in hostname resolution
+config.summary.AllowDotExit Toggles allowing exit notation in addresses
+config.summary.FastFirstHopPK Toggle public key usage for the first hop
+config.summary.TransPort Port for transparent proxying if the OS supports it
+config.summary.TransListenAddress Address from which transparent proxy connections can be made
+config.summary.NATDPort Port for forwarding ipfw NATD connections
+config.summary.NATDListenAddress Address from which NATD forwarded connections can be made
+config.summary.AutomapHostsOnResolve Map addresses ending with special suffixes to virtual addresses
+config.summary.AutomapHostsSuffixes Address suffixes recognized by AutomapHostsOnResolve
+config.summary.DNSPort Port from which DNS responses are fetched instead of tor
+config.summary.DNSListenAddress Address for performing DNS resolution
+config.summary.ClientDNSRejectInternalAddresses Ignores DNS responses for internal addresses
+config.summary.DownloadExtraInfo Toggles fetching of extra information about relays
+config.summary.FallbackNetworkstatusFile Path for a fallback cache of the consensus
+config.summary.WarnPlaintextPorts Toggles warnings for using risky ports
+config.summary.RejectPlaintextPorts Prevents connections on risky ports
+config.summary.AllowSingleHopCircuits Makes use of single hop exits if able
+
 # Snippets from common log messages
 # These are static bits of log messages, used to determine when entries with
 # dynamic content (hostnames, numbers, etc) are the same. If this matches the
@@ -122,8 +181,8 @@
 msg.WARN Problem bootstrapping. Stuck at
 msg.WARN *missing key,
 msg.ARM_DEBUG refresh rate:
-msg.ARM_DEBUG proc call (process cwd):
-msg.ARM_DEBUG proc call (process memory usage):
+msg.ARM_DEBUG proc call (cwd):
+msg.ARM_DEBUG proc call (memory usage):
 msg.ARM_DEBUG proc call (process command
 msg.ARM_DEBUG proc call (process utime
 msg.ARM_DEBUG proc call (process stime