[tor-commits] [tor/master] Remove two obsoleted options.

[nickm at torproject.org]

commit c83657c6878f805f01b5656c9f9a34f6fadc7307
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun May 14 19:06:15 2017 -0400

    Remove two obsoleted options.
    
    Spotted by atagar
    
    Closes #22257
---
 doc/tor.1.txt | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 1fffe08..0af4e5f 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -661,12 +661,6 @@ GENERAL OPTIONS
     following the Tor specification. Otherwise, they are logged with severity
     \'info'. (Default: 0)
 
-[[PredictedPortsRelevanceTime]] **PredictedPortsRelevanceTime** __NUM__::
-    Set how long, after the client has made an anonymized connection to a
-    given port, we will try to make sure that we build circuits to
-    exits that support that port. This option is deprecated. Please use
-    CircuitsAvailableTimeout instead.
-
 [[RunAsDaemon]] **RunAsDaemon** **0**|**1**::
     If 1, Tor forks and daemonizes to the background. This option has no effect
     on Windows; instead you should use the --service command-line option.
@@ -806,10 +800,6 @@ The following options are useful only for clients (that is, if
     from the specified value to twice that amount. (Default: 30 minutes;
     Max: 24 hours)
 
-[[CircuitIdleTimeout]] **CircuitIdleTimeout** __NUM__::
-    If we have kept a clean (never used) circuit around for NUM seconds, then
-    close it. This option is deprecated. Use CircuitsAvailableTimeout instead.
-
 [[CircuitStreamTimeout]] **CircuitStreamTimeout** __NUM__::
     If non-zero, this option overrides our internal timeout schedule for how
     many seconds until we detach a stream from a circuit and try a new circuit.