[tor-commits] [stem/master] Sync manual cache

[atagar at torproject.org]

commit 7c9fd84f56d004640501d880a756552df4d1a9f4
Author: Damian Johnson <atagar at torproject.org>
Date:   Mon Nov 14 08:42:18 2016 -0800

    Sync manual cache
    
    Usually I wouldn't bother for a minor one-off change but we're about to cut a
    release, so might as well make sure we're fully up to date.
---
 stem/cached_tor_manual.cfg | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/stem/cached_tor_manual.cfg b/stem/cached_tor_manual.cfg
index 0dbb6de..81fffb8 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 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 7dee70c3e1e12389a15c6f5bb4e41c9adeaaf054
-stem_commit 058fb76c9ba57676df3c209dfed6996ffb565257
+man_commit 9a790f7325049fdb3b48e86879cd05373cbcd1e3
+stem_commit d854d25405b642f7dbc3ddb98ffd3524f03da40c
 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-deprecated-options => List all valid options that are scheduled to become obsolete in a future version. (This is a warning, not a promise.)
@@ -1541,8 +1541,9 @@ config_options.HiddenServiceSingleHopMode.description
 |    servers with different IP addresses.
 |
 |    HiddenServiceSingleHopMode requires HiddenServiceNonAnonymousMode to be set
-|    to 1. Since a Single Onion is non-anonymous, you can not to run an
-|    anonymous SOCKSPort on the same tor instance as a Single Onion service.
+|    to 1. Since a Single Onion service is non-anonymous, you can not configure
+|    a SOCKSPort on a tor instance that is running in
+|    **HiddenServiceSingleHopMode**.
 |    (Default: 0)
 config_options.HiddenServiceNonAnonymousMode.category Hidden Service
 config_options.HiddenServiceNonAnonymousMode.name HiddenServiceNonAnonymousMode