[tor-commits] [stem/master] Updating with DirCache option

[atagar at torproject.org]

commit a7ec98cd73fe3e8b27b9c98a0389c231b0ff51b1
Author: Damian Johnson <atagar at torproject.org>
Date:   Tue Dec 22 08:47:10 2015 -0800

    Updating with DirCache option
---
 stem/cached_tor_manual.cfg |    9 +++++++--
 stem/settings.cfg          |    1 +
 test/integ/manual.py       |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/stem/cached_tor_manual.cfg b/stem/cached_tor_manual.cfg
index 9a6fed0..a05c4e9 100644
--- a/stem/cached_tor_manual.cfg
+++ b/stem/cached_tor_manual.cfg
@@ -6,8 +6,8 @@ description
 |Basically, Tor provides a distributed network of servers or relays ("onion routers"). Users bounce their TCP streams -- web traffic, ftp, ssh, etc. -- around the network, and recipients, observers, and even the relays themselves have difficulty tracking the source of the stream.
 |
 |By default, tor will only act as a client only. To help the network by providing bandwidth as a relay, change the ORPort configuration option -- see below. Please also consult the documentation on the Tor Project's website.
-man_commit aa4be914f06baa92857de201a212b9fc9856bdb1
-stem_commit d4fac7f81c180cf8e83ea81d4f3f2e8d0d2ce491
+man_commit 997f779a7f05540e5f564b4d121706c4a7069fb2
+stem_commit 4b49f5d1a616acfd7b1e5b9c7c82b3f8bed836d7
 commandline_options -f FILE => Specify a new configuration file to contain further Tor configuration options OR pass - to make Tor read its configuration from standard input. (Default: @CONFDIR@/torrc, or $HOME/.torrc if that file is not found)
 commandline_options --ignore-missing-torrc => Specifies that Tor should treat a missing torrc file as though it were empty. Ordinarily, Tor does this for missing default torrc files, but not for those specified on the command line.
 commandline_options --list-fingerprint => Generate your keys and output your nickname and fingerprint.
@@ -671,6 +671,11 @@ config_options.DirPolicy.name DirPolicy
 config_options.DirPolicy.usage policy,policy,...
 config_options.DirPolicy.summary Access policy for the DirPort
 config_options.DirPolicy.description Set an entrance policy for this server, to limit who can connect to the directory ports. The policies have the same form as exit policies above, except that port specifiers are ignored. Any address not matched by some entry in the policy is accepted.
+config_options.DirCache.category Directory
+config_options.DirCache.name DirCache
+config_options.DirCache.usage 0|1
+config_options.DirCache.summary Provide cached descriptor information to other tor users
+config_options.DirCache.description When this option is set, Tor caches all current directory documents and accepts client requests for them. Setting DirPort is not required for this, because clients connect via the ORPort by default. Setting either DirPort or BridgeRelay and setting DirCache to 0 is not supported. (Default: 1)
 config_options.BandwidthRate.category General
 config_options.BandwidthRate.name BandwidthRate
 config_options.BandwidthRate.usage N bytes|KBytes|MBytes|GBytes|KBits|MBits|GBits
diff --git a/stem/settings.cfg b/stem/settings.cfg
index b590afe..82e8f88 100644
--- a/stem/settings.cfg
+++ b/stem/settings.cfg
@@ -265,6 +265,7 @@ manual.summary.DirPortFrontPage Publish this html file on the DirPort
 manual.summary.DirPort Port for directory connections
 manual.summary.DirListenAddress Address the directory service is bound to
 manual.summary.DirPolicy Access policy for the DirPort
+manual.summary.DirCache Provide cached descriptor information to other tor users
 
 # Directory Authority Server Options
 
diff --git a/test/integ/manual.py b/test/integ/manual.py
index d0b1bf1..9fccb54 100644
--- a/test/integ/manual.py
+++ b/test/integ/manual.py
@@ -305,4 +305,4 @@ class TestManual(unittest.TestCase):
     extra_in_manual = config_options_in_manual.difference(config_options_in_tor)
 
     if extra_in_manual:
-      self.fail("The %s config options in our man page aren't presently supported by tor. Maybe we need to remove them?" % ', '.join(extra_in_manual))
+      self.fail("The %s config options in our man page aren't presently supported by tor. Are we using the latest git commit of tor? If so, maybe we need to remove them?" % ', '.join(extra_in_manual))