r13304@catbus: nickm | 2007-06-07 13:25:37 -0400

 Deprecate RedirectExits.

svn:r10526

diff --git a/doc/tor.1.in b/doc/tor.1.in
index cf6a05a6acaa95c09f6505b049980d02885a197f..0589d45bccde099ae84b86e66b22e6ae90c7c598 100644 (file)
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -765,6 +765,7 @@ a Tor controller that handles directory publishing for you.
 .LP
 .TP
 \fBRedirectExit \fR\fIpattern target\fP
+THIS OPTION IS DEPRECATED.  It will go away in a future version of Tor.
 Whenever an outgoing connection tries to connect to one of a given set
 of addresses, connect to \fItarget\fP (an \fIaddress:port\fP pair) instead.
 The address

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index b3f7ab4a2d3757489edba9c6992109e053266e8a..2c274c94e07a01ee82cc0391b523d111131e7141 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -2562,6 +2562,11 @@ set_exit_redirects(smartlist_t *lst)
     SMARTLIST_FOREACH(redirect_exit_list, exit_redirect_t *, p, tor_free(p));
     smartlist_free(redirect_exit_list);
   }
+  if (lst && smartlist_len(lst)) {
+    log_warn(LD_GENERAL,
+             "The RedirectExit option is deprecated; it will go away in a "
+             "future version of Tor.");
+  }
   redirect_exit_list = lst;
 }