diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-01-23 16:07:15 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-01-23 16:07:15 -0500 |
| commit | d95d9889463fcab0eac742b1634d64f1e8b4328a (patch) | |
| tree | 2797f73c1b39e1ef67760a986c4ac9a332921fb4 /doc | |
| parent | c4cc11a9df48defe73eccfa8296e7553bfd4da50 (diff) | |
| parent | 83307fc267e7de5fd3a9ccc0c51d6d377f454495 (diff) | |
| download | tor-d95d9889463fcab0eac742b1634d64f1e8b4328a.tar.gz tor-d95d9889463fcab0eac742b1634d64f1e8b4328a.zip | |
Merge branch 'feature_20956_029'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 8c8922bc29..da2a61f4b6 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2698,6 +2698,19 @@ The following options are used for running a testing Tor network. we replace it and issue a new key? (Default: 3 hours for link and auth; 1 day for signing.) +NON-PERSISTENT OPTIONS +---------------------- + +These options are not saved to the torrc file by the "SAVECONF" controller +command. Other options of this type are documented in control-spec.txt, +section 5.4. End-users should mostly ignore them. + +[[UnderscorePorts]] **\_\_ControlPort**, **\_\_DirPort**, **\_\_DNSPort**, **\_\_ExtORPort**, **\_\_NATDPort**, **\_\_ORPort**, **\_\_SocksPort**, **\_\_TransPort**:: + These underscore-prefixed options are variants of the regular Port + options. They behave the same, except they are not saved to the + torrc file by the controller's SAVECONF command. + + SIGNALS ------- |