Merge branch 'ticket20575_031_01_squashed'

diff --cc doc/tor.1.txt
Simple merge

diff --cc src/or/config.c
index 7d2ebbdd03226a996fe11fc16fb78079cf3b0478,218fd4ecfc752ef9e46920fac3c7455766be0432..3413442c3cdb58501c7d501edc4b497b3877274d
--- 1/src/or/config.c
--- 2/src/or/config.c
+++ b/src/or/config.c
@@@ -669,10 -662,44 +669,17 @@@ static const config_deprecation_t optio
    /* Deprecated since 0.2.9.2-alpha... */
    { "AllowDotExit", "Unrestricted use of the .exit notation can be used for "
      "a wide variety of application-level attacks." },
 -  { "AllowInvalidNodes", "There is no reason to enable this option; at best "
 -    "it will make you easier to track." },
 -  { "AllowSingleHopCircuits", "Almost no relays actually allow single-hop "
 -    "exits, making this option pointless." },
 -  { "AllowSingleHopExits", "Turning this on will make your relay easier "
 -    "to abuse." },
    { "ClientDNSRejectInternalAddresses", "Turning this on makes your client "
      "easier to fingerprint, and may open you to esoteric attacks." },
 -  { "ExcludeSingleHopRelays", "Turning it on makes your client easier to "
 -    "fingerprint." },
 -  { "FastFirstHopPK", "Changing this option does not make your client more "
 -    "secure, but does make it easier to fingerprint." },
 -  { "CloseHSClientCircuitsImmediatelyOnTimeout", "This option makes your "
 -    "client easier to fingerprint." },
 -  { "CloseHSServiceRendCircuitsImmediatelyOnTimeout", "This option makes "
 -    "your hidden services easier to fingerprint." },
 -  { "WarnUnsafeSocks", "Changing this option makes it easier for you "
 -    "to accidentally lose your anonymity by leaking DNS information" },
 -  { "TLSECGroup", "The default is a nice secure choice; the other option "
 -    "is less secure." },
 -  { "ControlListenAddress", "Use ControlPort instead." },
 -  { "DirListenAddress", "Use DirPort instead, possibly with the "
 -    "NoAdvertise sub-option" },
 -  { "DNSListenAddress", "Use DNSPort instead." },
 -  { "SocksListenAddress", "Use SocksPort instead." },
 -  { "TransListenAddress", "Use TransPort instead." },
 -  { "NATDListenAddress", "Use NATDPort instead." },
 -  { "ORListenAddress", "Use ORPort instead, possibly with the "
 -    "NoAdvertise sub-option" },
    /* End of options deprecated since 0.2.9.2-alpha. */
  
+   /* Deprecated since 0.3.2.0-alpha. */
+   { "HTTPProxy", "It only applies to direct unencrypted HTTP connections "
+     "to your directory server, which your Tor probably wasn't using." },
+   { "HTTPProxyAuthenticator", "HTTPProxy is deprecated in favor of HTTPSProxy "
+     "which should be used with HTTPSProxyAuthenticator." },
+   /* End of options deprecated since 0.3.2.0-alpha. */
+ 
    { NULL, NULL }
  };