Merge branch 'remove_allow_dotexit_v2'

1 files changed, 0 insertions, 7 deletions

diff --git a/src/or/or.h b/src/or/or.h
index 72fdea17ea..53ba94e90e 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4169,13 +4169,6 @@ typedef struct {
    * if we are a cache).  For authorities, this is always true. */
   int DownloadExtraInfo;
 
-  /** If true, we convert "www.google.com.foo.exit" addresses on the
-   * socks/trans/natd ports into "www.google.com" addresses that
-   * exit from the node "foo". Disabled by default since attacking
-   * websites and exit relays can use it to manipulate your path
-   * selection. */
-  int AllowDotExit;
-
   /** If true, we're configured to collect statistics on clients
    * requesting network statuses from us as directory. */
   int DirReqStatistics_option;