Merge branch 'remove_allow_dotexit_v2'

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

diff --cc src/or/config.c
index 4a1361f9f4421b1a445fed624978f839d16bbf8f,d2c076b712d7402aa2c7264ffa2d731952c8db54..93a00089875b2794c9cc452e48b986c69c41c4b6
--- 1/src/or/config.c
--- 2/src/or/config.c
+++ b/src/or/config.c
@@@ -684,11 -670,11 +684,6 @@@ static const config_var_t testing_tor_n
  #undef OBSOLETE
  
  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. */
    { "HTTPProxy", "It only applies to direct unencrypted HTTP connections "
      "to your directory server, which your Tor probably wasn't using." },

diff --cc src/or/connection_edge.c
Simple merge

diff --cc src/or/or.h
Simple merge

diff --cc src/test/test_entryconn.c
Simple merge