commit 37302e64a4c53975bfb300bd46024d1eb503bd11 Merge: fea2d84ce f02fd6c3a Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 15 12:10:47 2017 -0400
Merge branch 'remove_allow_dotexit_v2'
changes/bug23426 | 4 ++++ doc/tor.1.txt | 8 +------- src/or/config.c | 7 +------ src/or/connection_edge.c | 21 ++++++++++----------- src/or/or.h | 7 ------- src/test/test_entryconn.c | 36 ++++++------------------------------ 6 files changed, 22 insertions(+), 61 deletions(-)
diff --cc src/or/config.c index 4a1361f9f,d2c076b71..93a000898 --- a/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." },