[tor-commits] [tor/maint-0.3.2] Undo deprecation of ClientDNSRejectInternalAddresses

[nickm at torproject.org]

commit e491c05f96387178da0958614084cd6ab30f5ea7
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Sat Nov 4 16:24:52 2017 +0100

    Undo deprecation of ClientDNSRejectInternalAddresses
---
 src/or/config.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index c87786cb9..bba253200 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -646,7 +646,7 @@ static const config_var_t testing_tor_network_defaults[] = {
     "0, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 16, 32, 60"),
   V(ClientBootstrapConsensusMaxDownloadTries, UINT, "80"),
   V(ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries, UINT, "80"),
-  V(ClientDNSRejectInternalAddresses, BOOL,"0"), // deprecated in 0.2.9.2-alpha
+  V(ClientDNSRejectInternalAddresses, BOOL,"0"),
   V(ClientRejectInternalAddresses, BOOL,   "0"),
   V(CountPrivateBandwidth,       BOOL,     "1"),
   V(ExitPolicyRejectPrivate,     BOOL,     "0"),
@@ -694,8 +694,6 @@ static const config_deprecation_t option_deprecation_notes_[] = {
   /* 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." },
-  { "ClientDNSRejectInternalAddresses", "Turning this on makes your client "
-    "easier to fingerprint, and may open you to esoteric attacks." },
   /* End of options deprecated since 0.2.9.2-alpha. */
 
   /* Deprecated since 0.3.2.0-alpha. */