Merge remote-tracking branch 'public/Fix_19450'

1 files changed, 0 insertions, 20 deletions

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index b5d6e87683..b741a54ece 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -705,26 +705,6 @@ GENERAL OPTIONS
     networkstatus. This is an advanced option; you generally shouldn't have
     to mess with it. (Default: not set)
 
-[[DisableIOCP]] **DisableIOCP** **0**|**1**::
-    If Tor was built to use the Libevent's "bufferevents" networking code
-    and you're running on Windows, setting this option to 1 will tell Libevent
-    not to use the Windows IOCP networking API.  (Default: 1)
-
-[[UserspaceIOCPBuffers]] **UserspaceIOCPBuffers** **0**|**1**::
-    If IOCP is enabled (see DisableIOCP above), setting this option to 1
-    will tell Tor to disable kernel-space TCP buffers, in order to avoid
-    needless copy operations and try not to run out of non-paged RAM.
-    This feature is experimental; don't use it yet unless you're eager to
-    help tracking down bugs. (Default: 0)
-
-[[UseFilteringSSLBufferevents]] **UseFilteringSSLBufferevents** **0**|**1**::
-    Tells Tor to do its SSL communication using a chain of
-    bufferevents: one for SSL and one for networking.  This option has no
-    effect if bufferevents are disabled (in which case it can't turn on), or
-    if IOCP bufferevents are enabled (in which case it can't turn off).  This
-    option is useful for debugging only; most users shouldn't touch it.
-    (Default: 0)
-
 [[CountPrivateBandwidth]] **CountPrivateBandwidth** **0**|**1**::
     If this option is set, then Tor's rate-limiting applies not only to
     remote connections, but also to connections to private addresses like