[or-cvs] r10526: Deprecate RedirectExits. (in tor/trunk: . doc src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-06-07 13:26:19 -0400 (Thu, 07 Jun 2007)
New Revision: 10526

Modified:
   tor/trunk/
   tor/trunk/doc/tor.1.in
   tor/trunk/src/or/connection_edge.c
Log:
 r13304 at catbus:  nickm | 2007-06-07 13:25:37 -0400
 Deprecate RedirectExits.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r13304] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/doc/tor.1.in
===================================================================
--- tor/trunk/doc/tor.1.in	2007-06-07 16:19:17 UTC (rev 10525)
+++ tor/trunk/doc/tor.1.in	2007-06-07 17:26:19 UTC (rev 10526)
@@ -765,6 +765,7 @@
 .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

Modified: tor/trunk/src/or/connection_edge.c
===================================================================
--- tor/trunk/src/or/connection_edge.c	2007-06-07 16:19:17 UTC (rev 10525)
+++ tor/trunk/src/or/connection_edge.c	2007-06-07 17:26:19 UTC (rev 10526)
@@ -2562,6 +2562,11 @@
     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;
 }