diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-01-18 10:21:33 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-01-23 16:06:51 -0500 |
| commit | 83307fc267e7de5fd3a9ccc0c51d6d377f454495 (patch) | |
| tree | 71377fe9c8a4d3180f783cfb160bda6c2caefd17 /doc | |
| parent | 9469aaaa82b353655c8e17f654954231ba3b09c8 (diff) | |
| download | tor-83307fc267e7de5fd3a9ccc0c51d6d377f454495.tar.gz tor-83307fc267e7de5fd3a9ccc0c51d6d377f454495.zip | |
Add __SocksPort etc variants for non-persistent use
Implements feature 20956.
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 f1068cedc6..330cdd4492 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2668,6 +2668,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 ------- |