[or-cvs] r12508: backport r12507 (in tor/branches/tor-0_1_2-patches: . src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2007-11-15 17:08:12 -0500 (Thu, 15 Nov 2007)
New Revision: 12508

Modified:
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/src/or/config.c
Log:
backport r12507


Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2007-11-15 15:51:17 UTC (rev 12507)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2007-11-15 22:08:12 UTC (rev 12508)
@@ -5,7 +5,11 @@
     - Fix a memory leak on exit relays; we were leaking a cached_resolve_t
       on every successful resolve. Reported by Mike Perry.
 
+  o Minor bugfixes:
+    - Changing the ExitPolicyRejectPrivate setting should cause us to
+      rebuild our server descriptor.
 
+
 Changes in version 0.1.2.18 - 2007-10-28
   Tor 0.1.2.18 fixes many problems including crash bugs, problems with
   hidden service introduction that were causing huge delays, and a big

Modified: tor/branches/tor-0_1_2-patches/src/or/config.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/config.c	2007-11-15 15:51:17 UTC (rev 12507)
+++ tor/branches/tor-0_1_2-patches/src/or/config.c	2007-11-15 22:08:12 UTC (rev 12508)
@@ -2876,6 +2876,8 @@
       !opt_streq(old_options->Nickname,new_options->Nickname) ||
       !opt_streq(old_options->Address,new_options->Address) ||
       !config_lines_eq(old_options->ExitPolicy,new_options->ExitPolicy) ||
+      old_options->ExitPolicyRejectPrivate !=
+        new_options->ExitPolicyRejectPrivate ||
       old_options->ORPort != new_options->ORPort ||
       old_options->DirPort != new_options->DirPort ||
       old_options->ClientOnly != new_options->ClientOnly ||